vendor/openssl/3.5.5

335 files changed, 23470 insertions, 23595 deletions

diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
index 140b78e7cd97..a6765d20d856 100644
--- a/include/crypto/aes_platform.h
+++ b/include/crypto/aes_platform.h
@@ -8,309 +8,298 @@
  */
 
 #ifndef OSSL_AES_PLATFORM_H
-# define OSSL_AES_PLATFORM_H
-# pragma once
+#define OSSL_AES_PLATFORM_H
+#pragma once
 
-# include <openssl/aes.h>
+#include <openssl/aes.h>
 
-# ifdef VPAES_ASM
+#ifdef VPAES_ASM
 int vpaes_set_encrypt_key(const unsigned char *userKey, int bits,
-                          AES_KEY *key);
+    AES_KEY *key);
 int vpaes_set_decrypt_key(const unsigned char *userKey, int bits,
-                          AES_KEY *key);
+    AES_KEY *key);
 void vpaes_encrypt(const unsigned char *in, unsigned char *out,
-                   const AES_KEY *key);
+    const AES_KEY *key);
 void vpaes_decrypt(const unsigned char *in, unsigned char *out,
-                   const AES_KEY *key);
+    const AES_KEY *key);
 void vpaes_cbc_encrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length,
-                       const AES_KEY *key, unsigned char *ivec, int enc);
-# endif /* VPAES_ASM */
+    unsigned char *out,
+    size_t length,
+    const AES_KEY *key, unsigned char *ivec, int enc);
+#endif /* VPAES_ASM */
 
-# ifdef BSAES_ASM
+#ifdef BSAES_ASM
 void ossl_bsaes_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                            size_t length, const AES_KEY *key,
-                            unsigned char ivec[16], int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char ivec[16], int enc);
 void ossl_bsaes_ctr32_encrypt_blocks(const unsigned char *in,
-                                     unsigned char *out, size_t len,
-                                     const AES_KEY *key,
-                                     const unsigned char ivec[16]);
+    unsigned char *out, size_t len,
+    const AES_KEY *key,
+    const unsigned char ivec[16]);
 void ossl_bsaes_xts_encrypt(const unsigned char *inp, unsigned char *out,
-                            size_t len, const AES_KEY *key1,
-                            const AES_KEY *key2, const unsigned char iv[16]);
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char iv[16]);
 void ossl_bsaes_xts_decrypt(const unsigned char *inp, unsigned char *out,
-                            size_t len, const AES_KEY *key1,
-                            const AES_KEY *key2, const unsigned char iv[16]);
-# endif /* BSAES_ASM */
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char iv[16]);
+#endif /* BSAES_ASM */
 
-# ifdef AES_CTR_ASM
+#ifdef AES_CTR_ASM
 void AES_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t blocks, const AES_KEY *key,
-                       const unsigned char ivec[AES_BLOCK_SIZE]);
-# endif /*  AES_CTR_ASM */
+    size_t blocks, const AES_KEY *key,
+    const unsigned char ivec[AES_BLOCK_SIZE]);
+#endif /*  AES_CTR_ASM */
 
-# ifdef AES_XTS_ASM
+#ifdef AES_XTS_ASM
 void AES_xts_encrypt(const unsigned char *inp, unsigned char *out, size_t len,
-                     const AES_KEY *key1, const AES_KEY *key2,
-                     const unsigned char iv[16]);
+    const AES_KEY *key1, const AES_KEY *key2,
+    const unsigned char iv[16]);
 void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
-                     const AES_KEY *key1, const AES_KEY *key2,
-                     const unsigned char iv[16]);
-# endif /* AES_XTS_ASM */
+    const AES_KEY *key1, const AES_KEY *key2,
+    const unsigned char iv[16]);
+#endif /* AES_XTS_ASM */
 
-# if defined(OPENSSL_CPUID_OBJ)
-#  if (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
-#   include "crypto/ppc_arch.h"
-#   ifdef VPAES_ASM
-#    define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC)
-#   endif
-#   if !defined(OPENSSL_SYS_MACOSX)
-#    define HWAES_CAPABLE  (OPENSSL_ppccap_P & PPC_CRYPTO207)
-#    define HWAES_set_encrypt_key aes_p8_set_encrypt_key
-#    define HWAES_set_decrypt_key aes_p8_set_decrypt_key
-#    define HWAES_encrypt aes_p8_encrypt
-#    define HWAES_decrypt aes_p8_decrypt
-#    define HWAES_cbc_encrypt aes_p8_cbc_encrypt
-#    define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks
-#    define HWAES_xts_encrypt aes_p8_xts_encrypt
-#    define HWAES_xts_decrypt aes_p8_xts_decrypt
-#   endif /* OPENSSL_SYS_MACOSX */
-#   if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX)
-#    define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300)
-#    define AES_GCM_ENC_BYTES 128
-#    define AES_GCM_DEC_BYTES 128
+#if defined(OPENSSL_CPUID_OBJ)
+#if (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
+#include "crypto/ppc_arch.h"
+#ifdef VPAES_ASM
+#define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC)
+#endif
+#if !defined(OPENSSL_SYS_MACOSX)
+#define HWAES_CAPABLE (OPENSSL_ppccap_P & PPC_CRYPTO207)
+#define HWAES_set_encrypt_key aes_p8_set_encrypt_key
+#define HWAES_set_decrypt_key aes_p8_set_decrypt_key
+#define HWAES_encrypt aes_p8_encrypt
+#define HWAES_decrypt aes_p8_decrypt
+#define HWAES_cbc_encrypt aes_p8_cbc_encrypt
+#define HWAES_ctr32_encrypt_blocks aes_p8_ctr32_encrypt_blocks
+#define HWAES_xts_encrypt aes_p8_xts_encrypt
+#define HWAES_xts_decrypt aes_p8_xts_decrypt
+#endif /* OPENSSL_SYS_MACOSX */
+#if !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX)
+#define PPC_AES_GCM_CAPABLE (OPENSSL_ppccap_P & PPC_MADD300)
+#define AES_GCM_ENC_BYTES 128
+#define AES_GCM_DEC_BYTES 128
 size_t ppc_aes_gcm_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key, unsigned char ivec[16],
-                           u64 *Xi);
+    size_t len, const void *key, unsigned char ivec[16],
+    u64 *Xi);
 size_t ppc_aes_gcm_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key, unsigned char ivec[16],
-                           u64 *Xi);
-#    define AES_GCM_ASM_PPC(gctx) ((gctx)->ctr==aes_p8_ctr32_encrypt_blocks && \
-                                   (gctx)->gcm.funcs.ghash==gcm_ghash_p8)
-void gcm_ghash_p8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len);
-#   endif /* OPENSSL_SYS_AIX || OPENSSL_SYS_MACOSX */
-#  endif /* PPC */
+    size_t len, const void *key, unsigned char ivec[16],
+    u64 *Xi);
+#define AES_GCM_ASM_PPC(gctx) ((gctx)->ctr == aes_p8_ctr32_encrypt_blocks && (gctx)->gcm.funcs.ghash == gcm_ghash_p8)
+void gcm_ghash_p8(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len);
+#endif /* OPENSSL_SYS_AIX || OPENSSL_SYS_MACOSX */
+#endif /* PPC */
 
-#  if (defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64)) 
-#   include "arm_arch.h"
-#   if __ARM_MAX_ARCH__>=7
-#    if defined(BSAES_ASM)
-#     define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
-#    endif
-#    if defined(VPAES_ASM)
-#     define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
-#    endif
-#    define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
-#    define HWAES_set_encrypt_key aes_v8_set_encrypt_key
-#    define HWAES_set_decrypt_key aes_v8_set_decrypt_key
-#    define HWAES_encrypt aes_v8_encrypt
-#    define HWAES_decrypt aes_v8_decrypt
-#    define HWAES_cbc_encrypt aes_v8_cbc_encrypt
-#    define HWAES_ecb_encrypt aes_v8_ecb_encrypt
-#    if __ARM_MAX_ARCH__>=8 && (defined(__aarch64__) || defined(_M_ARM64))
-#     define ARMv8_HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
-#     define HWAES_xts_encrypt aes_v8_xts_encrypt
-#     define HWAES_xts_decrypt aes_v8_xts_decrypt
-#    endif
-#    define HWAES_ctr32_encrypt_blocks aes_v8_ctr32_encrypt_blocks
-#    define HWAES_ctr32_encrypt_blocks_unroll12_eor3 aes_v8_ctr32_encrypt_blocks_unroll12_eor3
-#    define AES_PMULL_CAPABLE ((OPENSSL_armcap_P & ARMV8_PMULL) && (OPENSSL_armcap_P & ARMV8_AES))
-#    define AES_UNROLL12_EOR3_CAPABLE (OPENSSL_armcap_P & ARMV8_UNROLL12_EOR3)
-#    define AES_GCM_ENC_BYTES 512
-#    define AES_GCM_DEC_BYTES 512
-#    if __ARM_MAX_ARCH__>=8 && (defined(__aarch64__) || defined(_M_ARM64))
-#     define AES_gcm_encrypt armv8_aes_gcm_encrypt
-#     define AES_gcm_decrypt armv8_aes_gcm_decrypt
-#     define AES_GCM_ASM(gctx) (((gctx)->ctr==aes_v8_ctr32_encrypt_blocks_unroll12_eor3 || \
-                                 (gctx)->ctr==aes_v8_ctr32_encrypt_blocks) && \
-                                (gctx)->gcm.funcs.ghash==gcm_ghash_v8)
+#if (defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64))
+#include "arm_arch.h"
+#if __ARM_MAX_ARCH__ >= 7
+#if defined(BSAES_ASM)
+#define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
+#endif
+#if defined(VPAES_ASM)
+#define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
+#endif
+#define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
+#define HWAES_set_encrypt_key aes_v8_set_encrypt_key
+#define HWAES_set_decrypt_key aes_v8_set_decrypt_key
+#define HWAES_encrypt aes_v8_encrypt
+#define HWAES_decrypt aes_v8_decrypt
+#define HWAES_cbc_encrypt aes_v8_cbc_encrypt
+#define HWAES_ecb_encrypt aes_v8_ecb_encrypt
+#if __ARM_MAX_ARCH__ >= 8 && (defined(__aarch64__) || defined(_M_ARM64))
+#define ARMv8_HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
+#define HWAES_xts_encrypt aes_v8_xts_encrypt
+#define HWAES_xts_decrypt aes_v8_xts_decrypt
+#endif
+#define HWAES_ctr32_encrypt_blocks aes_v8_ctr32_encrypt_blocks
+#define HWAES_ctr32_encrypt_blocks_unroll12_eor3 aes_v8_ctr32_encrypt_blocks_unroll12_eor3
+#define AES_PMULL_CAPABLE ((OPENSSL_armcap_P & ARMV8_PMULL) && (OPENSSL_armcap_P & ARMV8_AES))
+#define AES_UNROLL12_EOR3_CAPABLE (OPENSSL_armcap_P & ARMV8_UNROLL12_EOR3)
+#define AES_GCM_ENC_BYTES 512
+#define AES_GCM_DEC_BYTES 512
+#if __ARM_MAX_ARCH__ >= 8 && (defined(__aarch64__) || defined(_M_ARM64))
+#define AES_gcm_encrypt armv8_aes_gcm_encrypt
+#define AES_gcm_decrypt armv8_aes_gcm_decrypt
+#define AES_GCM_ASM(gctx) (((gctx)->ctr == aes_v8_ctr32_encrypt_blocks_unroll12_eor3 || (gctx)->ctr == aes_v8_ctr32_encrypt_blocks) && (gctx)->gcm.funcs.ghash == gcm_ghash_v8)
 /* The [unroll8_eor3_]aes_gcm_(enc|dec)_(128|192|256)_kernel() functions
  * take input length in BITS and return number of BYTES processed */
 size_t aes_gcm_enc_128_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t aes_gcm_enc_192_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t aes_gcm_enc_256_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t aes_gcm_dec_128_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t aes_gcm_dec_192_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t aes_gcm_dec_256_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t unroll8_eor3_aes_gcm_enc_128_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t unroll8_eor3_aes_gcm_enc_192_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t unroll8_eor3_aes_gcm_enc_256_kernel(const uint8_t *plaintext, uint64_t plaintext_length, uint8_t *ciphertext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t unroll8_eor3_aes_gcm_dec_128_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t unroll8_eor3_aes_gcm_dec_192_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t unroll8_eor3_aes_gcm_dec_256_kernel(const uint8_t *ciphertext, uint64_t plaintext_length, uint8_t *plaintext,
-                              uint64_t *Xi, unsigned char ivec[16], const void *key);
+    uint64_t *Xi, unsigned char ivec[16], const void *key);
 size_t armv8_aes_gcm_encrypt(const unsigned char *in, unsigned char *out, size_t len, const void *key,
-                             unsigned char ivec[16], u64 *Xi);
+    unsigned char ivec[16], u64 *Xi);
 size_t armv8_aes_gcm_decrypt(const unsigned char *in, unsigned char *out, size_t len, const void *key,
-                             unsigned char ivec[16], u64 *Xi);
-void gcm_ghash_v8(u64 Xi[2],const u128 Htable[16],const u8 *inp, size_t len);
-#    endif
-#   endif
-#  endif
-# endif /* OPENSSL_CPUID_OBJ */
+    unsigned char ivec[16], u64 *Xi);
+void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len);
+#endif
+#endif
+#endif
+#endif /* OPENSSL_CPUID_OBJ */
 
-# if     defined(AES_ASM) &&     ( \
-         defined(__x86_64)       || defined(__x86_64__)  || \
-         defined(_M_AMD64)       || defined(_M_X64)      )
-#  define AES_CBC_HMAC_SHA_CAPABLE 1
-#  define AESNI_CBC_HMAC_SHA_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
-# endif
+#if defined(AES_ASM) && (defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
+#define AES_CBC_HMAC_SHA_CAPABLE 1
+#define AESNI_CBC_HMAC_SHA_CAPABLE (OPENSSL_ia32cap_P[1] & (1 << (57 - 32)))
+#endif
 
-# if defined(__loongarch__) || defined(__loongarch64)
-#  include "loongarch_arch.h"
-#  if defined(VPAES_ASM)
-#   define VPAES_CAPABLE  (OPENSSL_loongarch_hwcap_P & LOONGARCH_HWCAP_LSX)
-#  endif
-# endif
+#if defined(__loongarch__) || defined(__loongarch64)
+#include "loongarch_arch.h"
+#if defined(VPAES_ASM)
+#define VPAES_CAPABLE (OPENSSL_loongarch_hwcap_P & LOONGARCH_HWCAP_LSX)
+#endif
+#endif
 
-# if     defined(AES_ASM) && !defined(I386_ONLY) &&      (  \
-         ((defined(__i386)       || defined(__i386__)    || \
-           defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2))|| \
-         defined(__x86_64)       || defined(__x86_64__)  || \
-         defined(_M_AMD64)       || defined(_M_X64)      )
+#if defined(AES_ASM) && !defined(I386_ONLY) && (((defined(__i386) || defined(__i386__) || defined(_M_IX86)) && defined(OPENSSL_IA32_SSE2)) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64))
 
 /* AES-NI section */
 
-#  define AESNI_CAPABLE   (OPENSSL_ia32cap_P[1]&(1<<(57-32)))
-#  ifdef VPAES_ASM
-#   define VPAES_CAPABLE   (OPENSSL_ia32cap_P[1]&(1<<(41-32)))
-#  endif
-#  ifdef BSAES_ASM
-#   define BSAES_CAPABLE   (OPENSSL_ia32cap_P[1]&(1<<(41-32)))
-#  endif
+#define AESNI_CAPABLE (OPENSSL_ia32cap_P[1] & (1 << (57 - 32)))
+#ifdef VPAES_ASM
+#define VPAES_CAPABLE (OPENSSL_ia32cap_P[1] & (1 << (41 - 32)))
+#endif
+#ifdef BSAES_ASM
+#define BSAES_CAPABLE (OPENSSL_ia32cap_P[1] & (1 << (41 - 32)))
+#endif
 
-#  define AES_GCM_ENC_BYTES 32
-#  define AES_GCM_DEC_BYTES 16
+#define AES_GCM_ENC_BYTES 32
+#define AES_GCM_DEC_BYTES 16
 
 int aesni_set_encrypt_key(const unsigned char *userKey, int bits,
-                          AES_KEY *key);
+    AES_KEY *key);
 int aesni_set_decrypt_key(const unsigned char *userKey, int bits,
-                          AES_KEY *key);
+    AES_KEY *key);
 
 void aesni_encrypt(const unsigned char *in, unsigned char *out,
-                   const AES_KEY *key);
+    const AES_KEY *key);
 void aesni_decrypt(const unsigned char *in, unsigned char *out,
-                   const AES_KEY *key);
+    const AES_KEY *key);
 
 void aesni_ecb_encrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length, const AES_KEY *key, int enc);
+    unsigned char *out,
+    size_t length, const AES_KEY *key, int enc);
 void aesni_cbc_encrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length,
-                       const AES_KEY *key, unsigned char *ivec, int enc);
-#  ifndef OPENSSL_NO_OCB
+    unsigned char *out,
+    size_t length,
+    const AES_KEY *key, unsigned char *ivec, int enc);
+#ifndef OPENSSL_NO_OCB
 void aesni_ocb_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t blocks, const void *key,
-                       size_t start_block_num,
-                       unsigned char offset_i[16],
-                       const unsigned char L_[][16],
-                       unsigned char checksum[16]);
+    size_t blocks, const void *key,
+    size_t start_block_num,
+    unsigned char offset_i[16],
+    const unsigned char L_[][16],
+    unsigned char checksum[16]);
 void aesni_ocb_decrypt(const unsigned char *in, unsigned char *out,
-                       size_t blocks, const void *key,
-                       size_t start_block_num,
-                       unsigned char offset_i[16],
-                       const unsigned char L_[][16],
-                       unsigned char checksum[16]);
-#  endif /* OPENSSL_NO_OCB */
+    size_t blocks, const void *key,
+    size_t start_block_num,
+    unsigned char offset_i[16],
+    const unsigned char L_[][16],
+    unsigned char checksum[16]);
+#endif /* OPENSSL_NO_OCB */
 
 void aesni_ctr32_encrypt_blocks(const unsigned char *in,
-                                unsigned char *out,
-                                size_t blocks,
-                                const void *key, const unsigned char *ivec);
+    unsigned char *out,
+    size_t blocks,
+    const void *key, const unsigned char *ivec);
 
 void aesni_xts_encrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length,
-                       const AES_KEY *key1, const AES_KEY *key2,
-                       const unsigned char iv[16]);
+    unsigned char *out,
+    size_t length,
+    const AES_KEY *key1, const AES_KEY *key2,
+    const unsigned char iv[16]);
 
 void aesni_xts_decrypt(const unsigned char *in,
-                       unsigned char *out,
-                       size_t length,
-                       const AES_KEY *key1, const AES_KEY *key2,
-                       const unsigned char iv[16]);
+    unsigned char *out,
+    size_t length,
+    const AES_KEY *key1, const AES_KEY *key2,
+    const unsigned char iv[16]);
 
 int aesni_xts_avx512_eligible(void);
 
 void aesni_xts_128_encrypt_avx512(const unsigned char *inp, unsigned char *out,
-                                  size_t len, const AES_KEY *key1,
-                                  const AES_KEY *key2,
-                                  const unsigned char iv[16]);
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2,
+    const unsigned char iv[16]);
 void aesni_xts_128_decrypt_avx512(const unsigned char *inp, unsigned char *out,
-                                  size_t len, const AES_KEY *key1,
-                                  const AES_KEY *key2,
-                                  const unsigned char iv[16]);
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2,
+    const unsigned char iv[16]);
 
 void aesni_xts_256_encrypt_avx512(const unsigned char *inp, unsigned char *out,
-                                  size_t len, const AES_KEY *key1,
-                                  const AES_KEY *key2,
-                                  const unsigned char iv[16]);
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2,
+    const unsigned char iv[16]);
 void aesni_xts_256_decrypt_avx512(const unsigned char *inp, unsigned char *out,
-                                  size_t len, const AES_KEY *key1,
-                                  const AES_KEY *key2,
-                                  const unsigned char iv[16]);
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2,
+    const unsigned char iv[16]);
 
 void aesni_ccm64_encrypt_blocks(const unsigned char *in,
-                                unsigned char *out,
-                                size_t blocks,
-                                const void *key,
-                                const unsigned char ivec[16],
-                                unsigned char cmac[16]);
+    unsigned char *out,
+    size_t blocks,
+    const void *key,
+    const unsigned char ivec[16],
+    unsigned char cmac[16]);
 
 void aesni_ccm64_decrypt_blocks(const unsigned char *in,
-                                unsigned char *out,
-                                size_t blocks,
-                                const void *key,
-                                const unsigned char ivec[16],
-                                unsigned char cmac[16]);
+    unsigned char *out,
+    size_t blocks,
+    const void *key,
+    const unsigned char ivec[16],
+    unsigned char cmac[16]);
 
-#  if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+#if defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
 size_t aesni_gcm_encrypt(const unsigned char *in, unsigned char *out, size_t len,
-                         const void *key, unsigned char ivec[16], u64 *Xi);
+    const void *key, unsigned char ivec[16], u64 *Xi);
 size_t aesni_gcm_decrypt(const unsigned char *in, unsigned char *out, size_t len,
-                         const void *key, unsigned char ivec[16], u64 *Xi);
+    const void *key, unsigned char ivec[16], u64 *Xi);
 void gcm_ghash_avx(u64 Xi[2], const u128 Htable[16], const u8 *in, size_t len);
 
-#   define AES_gcm_encrypt aesni_gcm_encrypt
-#   define AES_gcm_decrypt aesni_gcm_decrypt
-#   define AES_GCM_ASM(ctx)    (ctx->ctr == aesni_ctr32_encrypt_blocks && \
-                                ctx->gcm.funcs.ghash == gcm_ghash_avx)
-#  endif
+#define AES_gcm_encrypt aesni_gcm_encrypt
+#define AES_gcm_decrypt aesni_gcm_decrypt
+#define AES_GCM_ASM(ctx) (ctx->ctr == aesni_ctr32_encrypt_blocks && ctx->gcm.funcs.ghash == gcm_ghash_avx)
+#endif
 
-
-# elif defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
+#elif defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
 
 /* Fujitsu SPARC64 X support */
-#  include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
 
-#  define SPARC_AES_CAPABLE       (OPENSSL_sparcv9cap_P[1] & CFR_AES)
-#  define HWAES_CAPABLE           (OPENSSL_sparcv9cap_P[0] & SPARCV9_FJAESX)
-#  define HWAES_set_encrypt_key aes_fx_set_encrypt_key
-#  define HWAES_set_decrypt_key aes_fx_set_decrypt_key
-#  define HWAES_encrypt aes_fx_encrypt
-#  define HWAES_decrypt aes_fx_decrypt
-#  define HWAES_cbc_encrypt aes_fx_cbc_encrypt
-#  define HWAES_ctr32_encrypt_blocks aes_fx_ctr32_encrypt_blocks
+#define SPARC_AES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_AES)
+#define HWAES_CAPABLE (OPENSSL_sparcv9cap_P[0] & SPARCV9_FJAESX)
+#define HWAES_set_encrypt_key aes_fx_set_encrypt_key
+#define HWAES_set_decrypt_key aes_fx_set_decrypt_key
+#define HWAES_encrypt aes_fx_encrypt
+#define HWAES_decrypt aes_fx_decrypt
+#define HWAES_cbc_encrypt aes_fx_cbc_encrypt
+#define HWAES_ctr32_encrypt_blocks aes_fx_ctr32_encrypt_blocks
 
 void aes_t4_set_encrypt_key(const unsigned char *key, int bits, AES_KEY *ks);
 void aes_t4_set_decrypt_key(const unsigned char *key, int bits, AES_KEY *ks);
 void aes_t4_encrypt(const unsigned char *in, unsigned char *out,
-                    const AES_KEY *key);
+    const AES_KEY *key);
 void aes_t4_decrypt(const unsigned char *in, unsigned char *out,
-                    const AES_KEY *key);
+    const AES_KEY *key);
 /*
  * Key-length specific subroutines were chosen for following reason.
  * Each SPARC T4 core can execute up to 8 threads which share core's
@@ -323,288 +312,256 @@ void aes_t4_decrypt(const unsigned char *in, unsigned char *out,
  * by multiple key-length specific subroutines, so why fight?
  */
 void aes128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void aes128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void aes192_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void aes192_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void aes256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void aes256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const AES_KEY *key,
-                           unsigned char *ivec, int /*unused*/);
+    size_t len, const AES_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void aes128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t blocks, const AES_KEY *key,
-                             unsigned char *ivec);
+    size_t blocks, const AES_KEY *key,
+    unsigned char *ivec);
 void aes192_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t blocks, const AES_KEY *key,
-                             unsigned char *ivec);
+    size_t blocks, const AES_KEY *key,
+    unsigned char *ivec);
 void aes256_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t blocks, const AES_KEY *key,
-                             unsigned char *ivec);
+    size_t blocks, const AES_KEY *key,
+    unsigned char *ivec);
 void aes128_t4_xts_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t blocks, const AES_KEY *key1,
-                           const AES_KEY *key2, const unsigned char *ivec);
+    size_t blocks, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char *ivec);
 void aes128_t4_xts_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t blocks, const AES_KEY *key1,
-                           const AES_KEY *key2, const unsigned char *ivec);
+    size_t blocks, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char *ivec);
 void aes256_t4_xts_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t blocks, const AES_KEY *key1,
-                           const AES_KEY *key2, const unsigned char *ivec);
+    size_t blocks, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char *ivec);
 void aes256_t4_xts_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t blocks, const AES_KEY *key1,
-                           const AES_KEY *key2, const unsigned char *ivec);
+    size_t blocks, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char *ivec);
 
-# elif defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
+#elif defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
 /* IBM S390X support */
-#  include "s390x_arch.h"
-
+#include "s390x_arch.h"
 
 /* Convert key size to function code: [16,24,32] -> [18,19,20]. */
-#  define S390X_AES_FC(keylen)  (S390X_AES_128 + ((((keylen) << 3) - 128) >> 6))
+#define S390X_AES_FC(keylen) (S390X_AES_128 + ((((keylen) << 3) - 128) >> 6))
 
 /* Most modes of operation need km for partial block processing. */
-#  define S390X_aes_128_CAPABLE (OPENSSL_s390xcap_P.km[0] &  \
-                                S390X_CAPBIT(S390X_AES_128))
-#  define S390X_aes_192_CAPABLE (OPENSSL_s390xcap_P.km[0] &  \
-                                S390X_CAPBIT(S390X_AES_192))
-#  define S390X_aes_256_CAPABLE (OPENSSL_s390xcap_P.km[0] &  \
-                                S390X_CAPBIT(S390X_AES_256))
+#define S390X_aes_128_CAPABLE (OPENSSL_s390xcap_P.km[0] & S390X_CAPBIT(S390X_AES_128))
+#define S390X_aes_192_CAPABLE (OPENSSL_s390xcap_P.km[0] & S390X_CAPBIT(S390X_AES_192))
+#define S390X_aes_256_CAPABLE (OPENSSL_s390xcap_P.km[0] & S390X_CAPBIT(S390X_AES_256))
 
-#  define S390X_aes_128_cbc_CAPABLE     1       /* checked by callee */
-#  define S390X_aes_192_cbc_CAPABLE     1
-#  define S390X_aes_256_cbc_CAPABLE     1
+#define S390X_aes_128_cbc_CAPABLE 1 /* checked by callee */
+#define S390X_aes_192_cbc_CAPABLE 1
+#define S390X_aes_256_cbc_CAPABLE 1
 
-#  define S390X_aes_128_ecb_CAPABLE     S390X_aes_128_CAPABLE
-#  define S390X_aes_192_ecb_CAPABLE     S390X_aes_192_CAPABLE
-#  define S390X_aes_256_ecb_CAPABLE     S390X_aes_256_CAPABLE
+#define S390X_aes_128_ecb_CAPABLE S390X_aes_128_CAPABLE
+#define S390X_aes_192_ecb_CAPABLE S390X_aes_192_CAPABLE
+#define S390X_aes_256_ecb_CAPABLE S390X_aes_256_CAPABLE
 
-#  define S390X_aes_128_ofb_CAPABLE (S390X_aes_128_CAPABLE &&           \
-                                    (OPENSSL_s390xcap_P.kmo[0] &        \
-                                     S390X_CAPBIT(S390X_AES_128)))
-#  define S390X_aes_192_ofb_CAPABLE (S390X_aes_192_CAPABLE &&           \
-                                    (OPENSSL_s390xcap_P.kmo[0] &        \
-                                     S390X_CAPBIT(S390X_AES_192)))
-#  define S390X_aes_256_ofb_CAPABLE (S390X_aes_256_CAPABLE &&           \
-                                    (OPENSSL_s390xcap_P.kmo[0] &        \
-                                     S390X_CAPBIT(S390X_AES_256)))
+#define S390X_aes_128_ofb_CAPABLE (S390X_aes_128_CAPABLE && (OPENSSL_s390xcap_P.kmo[0] & S390X_CAPBIT(S390X_AES_128)))
+#define S390X_aes_192_ofb_CAPABLE (S390X_aes_192_CAPABLE && (OPENSSL_s390xcap_P.kmo[0] & S390X_CAPBIT(S390X_AES_192)))
+#define S390X_aes_256_ofb_CAPABLE (S390X_aes_256_CAPABLE && (OPENSSL_s390xcap_P.kmo[0] & S390X_CAPBIT(S390X_AES_256)))
 
-#  define S390X_aes_128_cfb_CAPABLE (S390X_aes_128_CAPABLE &&           \
-                                    (OPENSSL_s390xcap_P.kmf[0] &        \
-                                     S390X_CAPBIT(S390X_AES_128)))
-#  define S390X_aes_192_cfb_CAPABLE (S390X_aes_192_CAPABLE &&           \
-                                    (OPENSSL_s390xcap_P.kmf[0] &        \
-                                     S390X_CAPBIT(S390X_AES_192)))
-#  define S390X_aes_256_cfb_CAPABLE (S390X_aes_256_CAPABLE &&           \
-                                    (OPENSSL_s390xcap_P.kmf[0] &        \
-                                     S390X_CAPBIT(S390X_AES_256)))
-#  define S390X_aes_128_cfb8_CAPABLE (OPENSSL_s390xcap_P.kmf[0] &       \
-                                     S390X_CAPBIT(S390X_AES_128))
-#  define S390X_aes_192_cfb8_CAPABLE (OPENSSL_s390xcap_P.kmf[0] &       \
-                                     S390X_CAPBIT(S390X_AES_192))
-#  define S390X_aes_256_cfb8_CAPABLE (OPENSSL_s390xcap_P.kmf[0] &       \
-                                     S390X_CAPBIT(S390X_AES_256))
-#  define S390X_aes_128_cfb1_CAPABLE    0
-#  define S390X_aes_192_cfb1_CAPABLE    0
-#  define S390X_aes_256_cfb1_CAPABLE    0
+#define S390X_aes_128_cfb_CAPABLE (S390X_aes_128_CAPABLE && (OPENSSL_s390xcap_P.kmf[0] & S390X_CAPBIT(S390X_AES_128)))
+#define S390X_aes_192_cfb_CAPABLE (S390X_aes_192_CAPABLE && (OPENSSL_s390xcap_P.kmf[0] & S390X_CAPBIT(S390X_AES_192)))
+#define S390X_aes_256_cfb_CAPABLE (S390X_aes_256_CAPABLE && (OPENSSL_s390xcap_P.kmf[0] & S390X_CAPBIT(S390X_AES_256)))
+#define S390X_aes_128_cfb8_CAPABLE (OPENSSL_s390xcap_P.kmf[0] & S390X_CAPBIT(S390X_AES_128))
+#define S390X_aes_192_cfb8_CAPABLE (OPENSSL_s390xcap_P.kmf[0] & S390X_CAPBIT(S390X_AES_192))
+#define S390X_aes_256_cfb8_CAPABLE (OPENSSL_s390xcap_P.kmf[0] & S390X_CAPBIT(S390X_AES_256))
+#define S390X_aes_128_cfb1_CAPABLE 0
+#define S390X_aes_192_cfb1_CAPABLE 0
+#define S390X_aes_256_cfb1_CAPABLE 0
 
-#  define S390X_aes_128_ctr_CAPABLE     1       /* checked by callee */
-#  define S390X_aes_192_ctr_CAPABLE     1
-#  define S390X_aes_256_ctr_CAPABLE     1
+#define S390X_aes_128_ctr_CAPABLE 1 /* checked by callee */
+#define S390X_aes_192_ctr_CAPABLE 1
+#define S390X_aes_256_ctr_CAPABLE 1
 
-#  define S390X_aes_128_xts_CAPABLE     1       /* checked by callee */
-#  define S390X_aes_256_xts_CAPABLE     1
+#define S390X_aes_128_xts_CAPABLE 1 /* checked by callee */
+#define S390X_aes_256_xts_CAPABLE 1
 
-# define S390X_aes_128_gcm_CAPABLE (S390X_aes_128_CAPABLE &&        \
-                                    (OPENSSL_s390xcap_P.kma[0] &    \
-                                     S390X_CAPBIT(S390X_AES_128)))
-# define S390X_aes_192_gcm_CAPABLE (S390X_aes_192_CAPABLE &&        \
-                                    (OPENSSL_s390xcap_P.kma[0] &    \
-                                     S390X_CAPBIT(S390X_AES_192)))
-# define S390X_aes_256_gcm_CAPABLE (S390X_aes_256_CAPABLE &&        \
-                                    (OPENSSL_s390xcap_P.kma[0] &    \
-                                     S390X_CAPBIT(S390X_AES_256)))
+#define S390X_aes_128_gcm_CAPABLE (S390X_aes_128_CAPABLE && (OPENSSL_s390xcap_P.kma[0] & S390X_CAPBIT(S390X_AES_128)))
+#define S390X_aes_192_gcm_CAPABLE (S390X_aes_192_CAPABLE && (OPENSSL_s390xcap_P.kma[0] & S390X_CAPBIT(S390X_AES_192)))
+#define S390X_aes_256_gcm_CAPABLE (S390X_aes_256_CAPABLE && (OPENSSL_s390xcap_P.kma[0] & S390X_CAPBIT(S390X_AES_256)))
 
-#  define S390X_aes_128_ccm_CAPABLE (S390X_aes_128_CAPABLE &&       \
-                                    (OPENSSL_s390xcap_P.kmac[0] &   \
-                                     S390X_CAPBIT(S390X_AES_128)))
-#  define S390X_aes_192_ccm_CAPABLE (S390X_aes_192_CAPABLE &&       \
-                                    (OPENSSL_s390xcap_P.kmac[0] &   \
-                                     S390X_CAPBIT(S390X_AES_192)))
-#  define S390X_aes_256_ccm_CAPABLE (S390X_aes_256_CAPABLE &&       \
-                                    (OPENSSL_s390xcap_P.kmac[0] &   \
-                                     S390X_CAPBIT(S390X_AES_256)))
-#  define S390X_CCM_AAD_FLAG    0x40
+#define S390X_aes_128_ccm_CAPABLE (S390X_aes_128_CAPABLE && (OPENSSL_s390xcap_P.kmac[0] & S390X_CAPBIT(S390X_AES_128)))
+#define S390X_aes_192_ccm_CAPABLE (S390X_aes_192_CAPABLE && (OPENSSL_s390xcap_P.kmac[0] & S390X_CAPBIT(S390X_AES_192)))
+#define S390X_aes_256_ccm_CAPABLE (S390X_aes_256_CAPABLE && (OPENSSL_s390xcap_P.kmac[0] & S390X_CAPBIT(S390X_AES_256)))
+#define S390X_CCM_AAD_FLAG 0x40
 
-#  ifndef OPENSSL_NO_OCB
-#   define S390X_aes_128_ocb_CAPABLE    0
-#   define S390X_aes_192_ocb_CAPABLE    0
-#   define S390X_aes_256_ocb_CAPABLE    0
-#  endif /* OPENSSL_NO_OCB */
+#ifndef OPENSSL_NO_OCB
+#define S390X_aes_128_ocb_CAPABLE 0
+#define S390X_aes_192_ocb_CAPABLE 0
+#define S390X_aes_256_ocb_CAPABLE 0
+#endif /* OPENSSL_NO_OCB */
 
-#  ifndef OPENSSL_NO_SIV
-#   define S390X_aes_128_siv_CAPABLE    0
-#   define S390X_aes_192_siv_CAPABLE    0
-#   define S390X_aes_256_siv_CAPABLE    0
-#  endif /* OPENSSL_NO_SIV */
+#ifndef OPENSSL_NO_SIV
+#define S390X_aes_128_siv_CAPABLE 0
+#define S390X_aes_192_siv_CAPABLE 0
+#define S390X_aes_256_siv_CAPABLE 0
+#endif /* OPENSSL_NO_SIV */
 
 /* Convert key size to function code: [16,24,32] -> [18,19,20]. */
-#  define S390X_AES_FC(keylen)  (S390X_AES_128 + ((((keylen) << 3) - 128) >> 6))
-# elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+#define S390X_AES_FC(keylen) (S390X_AES_128 + ((((keylen) << 3) - 128) >> 6))
+#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
 /* RISC-V 64 support */
-#  include "riscv_arch.h"
+#include "riscv_arch.h"
 
 /* Zkne and Zknd extensions (scalar crypto AES). */
 int rv64i_zkne_set_encrypt_key(const unsigned char *userKey, const int bits,
-                               AES_KEY *key);
+    AES_KEY *key);
 int rv64i_zknd_set_decrypt_key(const unsigned char *userKey, const int bits,
-                               AES_KEY *key);
+    AES_KEY *key);
 void rv64i_zkne_encrypt(const unsigned char *in, unsigned char *out,
-                        const AES_KEY *key);
+    const AES_KEY *key);
 void rv64i_zknd_decrypt(const unsigned char *in, unsigned char *out,
-                        const AES_KEY *key);
+    const AES_KEY *key);
 /* Zvkned extension (vector crypto AES). */
 int rv64i_zvkned_set_encrypt_key(const unsigned char *userKey, const int bits,
-                                 AES_KEY *key);
+    AES_KEY *key);
 int rv64i_zvkned_set_decrypt_key(const unsigned char *userKey, const int bits,
-                                 AES_KEY *key);
+    AES_KEY *key);
 void rv64i_zvkned_encrypt(const unsigned char *in, unsigned char *out,
-                          const AES_KEY *key);
+    const AES_KEY *key);
 void rv64i_zvkned_decrypt(const unsigned char *in, unsigned char *out,
-                          const AES_KEY *key);
+    const AES_KEY *key);
 
 void rv64i_zvkned_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                              size_t length, const AES_KEY *key,
-                              unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, const int enc);
 
 void rv64i_zvkned_cbc_decrypt(const unsigned char *in, unsigned char *out,
-                              size_t length, const AES_KEY *key,
-                              unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, const int enc);
 
 void rv64i_zvkned_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                              size_t length, const AES_KEY *key,
-                              const int enc);
+    size_t length, const AES_KEY *key,
+    const int enc);
 
 void rv64i_zvkned_ecb_decrypt(const unsigned char *in, unsigned char *out,
-                              size_t length, const AES_KEY *key,
-                              const int enc);
+    size_t length, const AES_KEY *key,
+    const int enc);
 
 void rv64i_zvkb_zvkned_ctr32_encrypt_blocks(const unsigned char *in,
-                                            unsigned char *out, size_t blocks,
-                                            const void *key,
-                                            const unsigned char ivec[16]);
+    unsigned char *out, size_t blocks,
+    const void *key,
+    const unsigned char ivec[16]);
 
 size_t rv64i_zvkb_zvkg_zvkned_aes_gcm_encrypt(const unsigned char *in,
-                                              unsigned char *out, size_t len,
-                                              const void *key,
-                                              unsigned char ivec[16], u64 *Xi);
+    unsigned char *out, size_t len,
+    const void *key,
+    unsigned char ivec[16], u64 *Xi);
 
 size_t rv64i_zvkb_zvkg_zvkned_aes_gcm_decrypt(const unsigned char *in,
-                                              unsigned char *out, size_t len,
-                                              const void *key,
-                                              unsigned char ivec[16], u64 *Xi);
+    unsigned char *out, size_t len,
+    const void *key,
+    unsigned char ivec[16], u64 *Xi);
 
 void rv64i_zvbb_zvkg_zvkned_aes_xts_encrypt(const unsigned char *in,
-                                            unsigned char *out, size_t length,
-                                            const AES_KEY *key1,
-                                            const AES_KEY *key2,
-                                            const unsigned char iv[16]);
+    unsigned char *out, size_t length,
+    const AES_KEY *key1,
+    const AES_KEY *key2,
+    const unsigned char iv[16]);
 
 void rv64i_zvbb_zvkg_zvkned_aes_xts_decrypt(const unsigned char *in,
-                                            unsigned char *out, size_t length,
-                                            const AES_KEY *key1,
-                                            const AES_KEY *key2,
-                                            const unsigned char iv[16]);
+    unsigned char *out, size_t length,
+    const AES_KEY *key1,
+    const AES_KEY *key2,
+    const unsigned char iv[16]);
 
 void gcm_ghash_rv64i_zvkg(u64 Xi[2], const u128 Htable[16], const u8 *inp,
-                          size_t len);
+    size_t len);
 
 #define AES_GCM_ENC_BYTES 64
 #define AES_GCM_DEC_BYTES 64
 #define AES_gcm_encrypt rv64i_zvkb_zvkg_zvkned_aes_gcm_encrypt
 #define AES_gcm_decrypt rv64i_zvkb_zvkg_zvkned_aes_gcm_decrypt
-#define AES_GCM_ASM(ctx)                                                       \
-    (ctx->ctr == rv64i_zvkb_zvkned_ctr32_encrypt_blocks &&                     \
-     ctx->gcm.funcs.ghash == gcm_ghash_rv64i_zvkg)
+#define AES_GCM_ASM(ctx) \
+    (ctx->ctr == rv64i_zvkb_zvkned_ctr32_encrypt_blocks && ctx->gcm.funcs.ghash == gcm_ghash_rv64i_zvkg)
 
-# elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
+#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
 /* RISC-V 32 support */
-#  include "riscv_arch.h"
+#include "riscv_arch.h"
 
 int rv32i_zkne_set_encrypt_key(const unsigned char *userKey, const int bits,
-                               AES_KEY *key);
+    AES_KEY *key);
 /* set_decrypt_key needs both zknd and zkne */
 int rv32i_zknd_zkne_set_decrypt_key(const unsigned char *userKey, const int bits,
-                                    AES_KEY *key);
+    AES_KEY *key);
 int rv32i_zbkb_zkne_set_encrypt_key(const unsigned char *userKey, const int bits,
-                                    AES_KEY *key);
+    AES_KEY *key);
 int rv32i_zbkb_zknd_zkne_set_decrypt_key(const unsigned char *userKey, const int bits,
-                                         AES_KEY *key);
+    AES_KEY *key);
 void rv32i_zkne_encrypt(const unsigned char *in, unsigned char *out,
-                        const AES_KEY *key);
+    const AES_KEY *key);
 void rv32i_zknd_decrypt(const unsigned char *in, unsigned char *out,
-                        const AES_KEY *key);
-# endif
+    const AES_KEY *key);
+#endif
 
-# if defined(HWAES_CAPABLE)
+#if defined(HWAES_CAPABLE)
 int HWAES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                          AES_KEY *key);
+    AES_KEY *key);
 int HWAES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                          AES_KEY *key);
+    AES_KEY *key);
 void HWAES_encrypt(const unsigned char *in, unsigned char *out,
-                   const AES_KEY *key);
+    const AES_KEY *key);
 void HWAES_decrypt(const unsigned char *in, unsigned char *out,
-                   const AES_KEY *key);
+    const AES_KEY *key);
 void HWAES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const AES_KEY *key,
-                       unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, const int enc);
 void HWAES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const AES_KEY *key,
-                       const int enc);
+    size_t length, const AES_KEY *key,
+    const int enc);
 void HWAES_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
-                                size_t len, const void *key,
-                                const unsigned char ivec[16]);
-#  if defined(AES_UNROLL12_EOR3_CAPABLE)
+    size_t len, const void *key,
+    const unsigned char ivec[16]);
+#if defined(AES_UNROLL12_EOR3_CAPABLE)
 void HWAES_ctr32_encrypt_blocks_unroll12_eor3(const unsigned char *in, unsigned char *out,
-                                              size_t len, const void *key,
-                                              const unsigned char ivec[16]);
-#  endif
+    size_t len, const void *key,
+    const unsigned char ivec[16]);
+#endif
 void HWAES_xts_encrypt(const unsigned char *inp, unsigned char *out,
-                       size_t len, const AES_KEY *key1,
-                       const AES_KEY *key2, const unsigned char iv[16]);
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char iv[16]);
 void HWAES_xts_decrypt(const unsigned char *inp, unsigned char *out,
-                       size_t len, const AES_KEY *key1,
-                       const AES_KEY *key2, const unsigned char iv[16]);
-#  ifndef OPENSSL_NO_OCB
-#   ifdef HWAES_ocb_encrypt
+    size_t len, const AES_KEY *key1,
+    const AES_KEY *key2, const unsigned char iv[16]);
+#ifndef OPENSSL_NO_OCB
+#ifdef HWAES_ocb_encrypt
 void HWAES_ocb_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t blocks, const void *key,
-                       size_t start_block_num,
-                       unsigned char offset_i[16],
-                       const unsigned char L_[][16],
-                       unsigned char checksum[16]);
-#   else
-#     define HWAES_ocb_encrypt ((ocb128_f)NULL)
-#   endif
-#   ifdef HWAES_ocb_decrypt
+    size_t blocks, const void *key,
+    size_t start_block_num,
+    unsigned char offset_i[16],
+    const unsigned char L_[][16],
+    unsigned char checksum[16]);
+#else
+#define HWAES_ocb_encrypt ((ocb128_f)NULL)
+#endif
+#ifdef HWAES_ocb_decrypt
 void HWAES_ocb_decrypt(const unsigned char *in, unsigned char *out,
-                       size_t blocks, const void *key,
-                       size_t start_block_num,
-                       unsigned char offset_i[16],
-                       const unsigned char L_[][16],
-                       unsigned char checksum[16]);
-#   else
-#     define HWAES_ocb_decrypt ((ocb128_f)NULL)
-#   endif
-#  endif /* OPENSSL_NO_OCB */
+    size_t blocks, const void *key,
+    size_t start_block_num,
+    unsigned char offset_i[16],
+    const unsigned char L_[][16],
+    unsigned char checksum[16]);
+#else
+#define HWAES_ocb_decrypt ((ocb128_f)NULL)
+#endif
+#endif /* OPENSSL_NO_OCB */
 
-# endif /* HWAES_CAPABLE */
+#endif /* HWAES_CAPABLE */
 
 #endif /* OSSL_AES_PLATFORM_H */
diff --git a/include/crypto/aria.h b/include/crypto/aria.h
index 21a9932e847c..75b812c5d635 100644
--- a/include/crypto/aria.h
+++ b/include/crypto/aria.h
@@ -8,23 +8,23 @@
  * https://www.openssl.org/source/license.html
  */
 
- /* Copyright (c) 2017 National Security Research Institute.  All rights reserved. */
+/* Copyright (c) 2017 National Security Research Institute.  All rights reserved. */
 
 #ifndef OSSL_CRYPTO_ARIA_H
-# define OSSL_CRYPTO_ARIA_H
-# pragma once
+#define OSSL_CRYPTO_ARIA_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifdef OPENSSL_NO_ARIA
-#  error ARIA is disabled.
-# endif
+#ifdef OPENSSL_NO_ARIA
+#error ARIA is disabled.
+#endif
 
-# define ARIA_ENCRYPT     1
-# define ARIA_DECRYPT     0
+#define ARIA_ENCRYPT 1
+#define ARIA_DECRYPT 0
 
-# define ARIA_BLOCK_SIZE    16  /* Size of each encryption/decryption block */
-# define ARIA_MAX_KEYS      17  /* Number of keys needed in the worst case  */
+#define ARIA_BLOCK_SIZE 16 /* Size of each encryption/decryption block */
+#define ARIA_MAX_KEYS 17 /* Number of keys needed in the worst case  */
 
 typedef union {
     unsigned char c[ARIA_BLOCK_SIZE];
@@ -39,13 +39,12 @@ struct aria_key_st {
 };
 typedef struct aria_key_st ARIA_KEY;
 
-
 int ossl_aria_set_encrypt_key(const unsigned char *userKey, const int bits,
-                              ARIA_KEY *key);
+    ARIA_KEY *key);
 int ossl_aria_set_decrypt_key(const unsigned char *userKey, const int bits,
-                              ARIA_KEY *key);
+    ARIA_KEY *key);
 
 void ossl_aria_encrypt(const unsigned char *in, unsigned char *out,
-                       const ARIA_KEY *key);
+    const ARIA_KEY *key);
 
 #endif
diff --git a/include/crypto/asn1.h b/include/crypto/asn1.h
index 8461c1be8d21..1a890fc6bbd8 100644
--- a/include/crypto/asn1.h
+++ b/include/crypto/asn1.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_CRYPTO_ASN1_H
-# define OSSL_CRYPTO_ASN1_H
-# pragma once
+#define OSSL_CRYPTO_ASN1_H
+#pragma once
 
-# include <openssl/asn1.h>
-# include <openssl/core_dispatch.h> /* OSSL_FUNC_keymgmt_import() */
+#include <openssl/asn1.h>
+#include <openssl/core_dispatch.h> /* OSSL_FUNC_keymgmt_import() */
 
 /* Internal ASN1 structures and functions: not for application use */
 
@@ -26,67 +26,67 @@ struct evp_pkey_asn1_method_st {
     unsigned long pkey_flags;
     char *pem_str;
     char *info;
-    int (*pub_decode) (EVP_PKEY *pk, const X509_PUBKEY *pub);
-    int (*pub_encode) (X509_PUBKEY *pub, const EVP_PKEY *pk);
-    int (*pub_cmp) (const EVP_PKEY *a, const EVP_PKEY *b);
-    int (*pub_print) (BIO *out, const EVP_PKEY *pkey, int indent,
-                      ASN1_PCTX *pctx);
-    int (*priv_decode) (EVP_PKEY *pk, const PKCS8_PRIV_KEY_INFO *p8inf);
-    int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);
-    int (*priv_print) (BIO *out, const EVP_PKEY *pkey, int indent,
-                       ASN1_PCTX *pctx);
-    int (*pkey_size) (const EVP_PKEY *pk);
-    int (*pkey_bits) (const EVP_PKEY *pk);
-    int (*pkey_security_bits) (const EVP_PKEY *pk);
-    int (*param_decode) (EVP_PKEY *pkey,
-                         const unsigned char **pder, int derlen);
-    int (*param_encode) (const EVP_PKEY *pkey, unsigned char **pder);
-    int (*param_missing) (const EVP_PKEY *pk);
-    int (*param_copy) (EVP_PKEY *to, const EVP_PKEY *from);
-    int (*param_cmp) (const EVP_PKEY *a, const EVP_PKEY *b);
-    int (*param_print) (BIO *out, const EVP_PKEY *pkey, int indent,
-                        ASN1_PCTX *pctx);
-    int (*sig_print) (BIO *out,
-                      const X509_ALGOR *sigalg, const ASN1_STRING *sig,
-                      int indent, ASN1_PCTX *pctx);
-    void (*pkey_free) (EVP_PKEY *pkey);
-    int (*pkey_ctrl) (EVP_PKEY *pkey, int op, long arg1, void *arg2);
+    int (*pub_decode)(EVP_PKEY *pk, const X509_PUBKEY *pub);
+    int (*pub_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk);
+    int (*pub_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
+    int (*pub_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+        ASN1_PCTX *pctx);
+    int (*priv_decode)(EVP_PKEY *pk, const PKCS8_PRIV_KEY_INFO *p8inf);
+    int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pk);
+    int (*priv_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+        ASN1_PCTX *pctx);
+    int (*pkey_size)(const EVP_PKEY *pk);
+    int (*pkey_bits)(const EVP_PKEY *pk);
+    int (*pkey_security_bits)(const EVP_PKEY *pk);
+    int (*param_decode)(EVP_PKEY *pkey,
+        const unsigned char **pder, int derlen);
+    int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder);
+    int (*param_missing)(const EVP_PKEY *pk);
+    int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from);
+    int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
+    int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
+        ASN1_PCTX *pctx);
+    int (*sig_print)(BIO *out,
+        const X509_ALGOR *sigalg, const ASN1_STRING *sig,
+        int indent, ASN1_PCTX *pctx);
+    void (*pkey_free)(EVP_PKEY *pkey);
+    int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);
     /* Legacy functions for old PEM */
-    int (*old_priv_decode) (EVP_PKEY *pkey,
-                            const unsigned char **pder, int derlen);
-    int (*old_priv_encode) (const EVP_PKEY *pkey, unsigned char **pder);
+    int (*old_priv_decode)(EVP_PKEY *pkey,
+        const unsigned char **pder, int derlen);
+    int (*old_priv_encode)(const EVP_PKEY *pkey, unsigned char **pder);
     /* Custom ASN1 signature verification */
-    int (*item_verify) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *data,
-                        const X509_ALGOR *a, const ASN1_BIT_STRING *sig,
-                        EVP_PKEY *pkey);
-    int (*item_sign) (EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *data,
-                      X509_ALGOR *alg1, X509_ALGOR *alg2,
-                      ASN1_BIT_STRING *sig);
-    int (*siginf_set) (X509_SIG_INFO *siginf, const X509_ALGOR *alg,
-                       const ASN1_STRING *sig);
+    int (*item_verify)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *data,
+        const X509_ALGOR *a, const ASN1_BIT_STRING *sig,
+        EVP_PKEY *pkey);
+    int (*item_sign)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, const void *data,
+        X509_ALGOR *alg1, X509_ALGOR *alg2,
+        ASN1_BIT_STRING *sig);
+    int (*siginf_set)(X509_SIG_INFO *siginf, const X509_ALGOR *alg,
+        const ASN1_STRING *sig);
     /* Check */
-    int (*pkey_check) (const EVP_PKEY *pk);
-    int (*pkey_public_check) (const EVP_PKEY *pk);
-    int (*pkey_param_check) (const EVP_PKEY *pk);
+    int (*pkey_check)(const EVP_PKEY *pk);
+    int (*pkey_public_check)(const EVP_PKEY *pk);
+    int (*pkey_param_check)(const EVP_PKEY *pk);
     /* Get/set raw private/public key data */
-    int (*set_priv_key) (EVP_PKEY *pk, const unsigned char *priv, size_t len);
-    int (*set_pub_key) (EVP_PKEY *pk, const unsigned char *pub, size_t len);
-    int (*get_priv_key) (const EVP_PKEY *pk, unsigned char *priv, size_t *len);
-    int (*get_pub_key) (const EVP_PKEY *pk, unsigned char *pub, size_t *len);
+    int (*set_priv_key)(EVP_PKEY *pk, const unsigned char *priv, size_t len);
+    int (*set_pub_key)(EVP_PKEY *pk, const unsigned char *pub, size_t len);
+    int (*get_priv_key)(const EVP_PKEY *pk, unsigned char *priv, size_t *len);
+    int (*get_pub_key)(const EVP_PKEY *pk, unsigned char *pub, size_t *len);
 
     /* Exports and imports to / from providers */
-    size_t (*dirty_cnt) (const EVP_PKEY *pk);
-    int (*export_to) (const EVP_PKEY *pk, void *to_keydata,
-                      OSSL_FUNC_keymgmt_import_fn *importer,
-                      OSSL_LIB_CTX *libctx, const char *propq);
+    size_t (*dirty_cnt)(const EVP_PKEY *pk);
+    int (*export_to)(const EVP_PKEY *pk, void *to_keydata,
+        OSSL_FUNC_keymgmt_import_fn *importer,
+        OSSL_LIB_CTX *libctx, const char *propq);
     OSSL_CALLBACK *import_from;
-    int (*copy) (EVP_PKEY *to, EVP_PKEY *from);
+    int (*copy)(EVP_PKEY *to, EVP_PKEY *from);
 
-    int (*priv_decode_ex) (EVP_PKEY *pk,
-                                    const PKCS8_PRIV_KEY_INFO *p8inf,
-                                    OSSL_LIB_CTX *libctx,
-                                    const char *propq);
-} /* EVP_PKEY_ASN1_METHOD */ ;
+    int (*priv_decode_ex)(EVP_PKEY *pk,
+        const PKCS8_PRIV_KEY_INFO *p8inf,
+        OSSL_LIB_CTX *libctx,
+        const char *propq);
+} /* EVP_PKEY_ASN1_METHOD */;
 
 DEFINE_STACK_OF_CONST(EVP_PKEY_ASN1_METHOD)
 
@@ -107,16 +107,16 @@ extern const EVP_PKEY_ASN1_METHOD ossl_rsa_pss_asn1_meth;
  * These are used internally in the ASN1_OBJECT to keep track of whether the
  * names and data need to be free()ed
  */
-# define ASN1_OBJECT_FLAG_DYNAMIC         0x01/* internal use */
-# define ASN1_OBJECT_FLAG_CRITICAL        0x02/* critical x509v3 object id */
-# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */
-# define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08/* internal use */
+#define ASN1_OBJECT_FLAG_DYNAMIC 0x01 /* internal use */
+#define ASN1_OBJECT_FLAG_CRITICAL 0x02 /* critical x509v3 object id */
+#define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04 /* internal use */
+#define ASN1_OBJECT_FLAG_DYNAMIC_DATA 0x08 /* internal use */
 struct asn1_object_st {
     const char *sn, *ln;
     int nid;
     int length;
-    const unsigned char *data;  /* data remains const after init */
-    int flags;                  /* Should we free this one */
+    const unsigned char *data; /* data remains const after init */
+    int flags; /* Should we free this one */
 };
 
 /* ASN1 print context structure */
@@ -127,14 +127,14 @@ struct asn1_pctx_st {
     unsigned long cert_flags;
     unsigned long oid_flags;
     unsigned long str_flags;
-} /* ASN1_PCTX */ ;
+} /* ASN1_PCTX */;
 
 /* ASN1 type functions */
 
 int ossl_asn1_type_set_octetstring_int(ASN1_TYPE *a, long num,
-                                       unsigned char *data, int len);
+    unsigned char *data, int len);
 int ossl_asn1_type_get_octetstring_int(const ASN1_TYPE *a, long *num,
-                                       unsigned char *data, int max_len);
+    unsigned char *data, int max_len);
 
 int ossl_x509_algor_new_from_md(X509_ALGOR **palg, const EVP_MD *md);
 const EVP_MD *ossl_x509_algor_get_md(X509_ALGOR *alg);
@@ -143,10 +143,15 @@ int ossl_x509_algor_md_to_mgf1(X509_ALGOR **palg, const EVP_MD *mgf1md);
 int ossl_asn1_time_print_ex(BIO *bp, const ASN1_TIME *tm, unsigned long flags);
 
 EVP_PKEY *ossl_d2i_PrivateKey_legacy(int keytype, EVP_PKEY **a,
-                                     const unsigned char **pp, long length,
-                                     OSSL_LIB_CTX *libctx, const char *propq);
+    const unsigned char **pp, long length,
+    OSSL_LIB_CTX *libctx, const char *propq);
 X509_ALGOR *ossl_X509_ALGOR_from_nid(int nid, int ptype, void *pval);
 
 void ossl_asn1_string_set_bits_left(ASN1_STRING *str, unsigned int num);
 
+int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
+    long len, const ASN1_ITEM *it, int tag, int aclass,
+    char opt, ASN1_TLC *ctx, int depth,
+    OSSL_LIB_CTX *libctx, const char *propq);
+
 #endif /* ndef OSSL_CRYPTO_ASN1_H */
diff --git a/include/crypto/asn1_dsa.h b/include/crypto/asn1_dsa.h
index 3eadb9ec3c54..6f37428cfbc2 100644
--- a/include/crypto/asn1_dsa.h
+++ b/include/crypto/asn1_dsa.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_CRYPTO_ASN1_DSA_H
-# define OSSL_CRYPTO_ASN1_DSA_H
-# pragma once
+#define OSSL_CRYPTO_ASN1_DSA_H
+#pragma once
 
 #include "internal/packet.h"
 
@@ -19,6 +19,6 @@ int ossl_encode_der_dsa_sig(WPACKET *pkt, const BIGNUM *r, const BIGNUM *s);
 int ossl_decode_der_length(PACKET *pkt, PACKET *subpkt);
 int ossl_decode_der_integer(PACKET *pkt, BIGNUM *n);
 size_t ossl_decode_der_dsa_sig(BIGNUM *r, BIGNUM *s, const unsigned char **ppin,
-                               size_t len);
+    size_t len);
 
 #endif
diff --git a/include/crypto/asn1err.h b/include/crypto/asn1err.h
index 6441386bbc4a..62fdfd5e9bf2 100644
--- a/include/crypto/asn1err.h
+++ b/include/crypto/asn1err.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_ASN1ERR_H
-# define OSSL_CRYPTO_ASN1ERR_H
-# pragma once
+#define OSSL_CRYPTO_ASN1ERR_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_ASN1_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/async.h b/include/crypto/async.h
index 7bc0dbb65b79..394d16de4f22 100644
--- a/include/crypto/async.h
+++ b/include/crypto/async.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_CRYPTO_ASYNC_H
-# define OSSL_CRYPTO_ASYNC_H
-# pragma once
+#define OSSL_CRYPTO_ASYNC_H
+#pragma once
 
-# include <openssl/async.h>
+#include <openssl/async.h>
 
 int async_init(void);
 void async_deinit(void);
diff --git a/include/crypto/asyncerr.h b/include/crypto/asyncerr.h
index 574e0af733ba..6a653247abf5 100644
--- a/include/crypto/asyncerr.h
+++ b/include/crypto/asyncerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_ASYNCERR_H
-# define OSSL_CRYPTO_ASYNCERR_H
-# pragma once
+#define OSSL_CRYPTO_ASYNCERR_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_ASYNC_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/bioerr.h b/include/crypto/bioerr.h
index e38b981ab544..f30975213efc 100644
--- a/include/crypto/bioerr.h
+++ b/include/crypto/bioerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_BIOERR_H
-# define OSSL_CRYPTO_BIOERR_H
-# pragma once
+#define OSSL_CRYPTO_BIOERR_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_BIO_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/bn.h b/include/crypto/bn.h
index 737796390037..952840be5e66 100644
--- a/include/crypto/bn.h
+++ b/include/crypto/bn.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_CRYPTO_BN_H
-# define OSSL_CRYPTO_BN_H
-# pragma once
+#define OSSL_CRYPTO_BN_H
+#pragma once
 
-# include <openssl/bn.h>
-# include <limits.h>
+#include <openssl/bn.h>
+#include <limits.h>
 
 BIGNUM *bn_wexpand(BIGNUM *a, int words);
 BIGNUM *bn_expand2(BIGNUM *a, int words);
@@ -72,75 +72,75 @@ int bn_set_words(BIGNUM *a, const BN_ULONG *words, int num_words);
  * code...
  */
 int bn_mul_mont_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                          BN_MONT_CTX *mont, BN_CTX *ctx);
+    BN_MONT_CTX *mont, BN_CTX *ctx);
 int bn_mod_exp_mont_fixed_top(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
-                              const BIGNUM *m, BN_CTX *ctx,
-                              BN_MONT_CTX *in_mont);
+    const BIGNUM *m, BN_CTX *ctx,
+    BN_MONT_CTX *in_mont);
 int bn_to_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                         BN_CTX *ctx);
+    BN_CTX *ctx);
 int bn_from_mont_fixed_top(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                           BN_CTX *ctx);
+    BN_CTX *ctx);
 int bn_mod_add_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                         const BIGNUM *m);
+    const BIGNUM *m);
 int bn_mod_sub_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                         const BIGNUM *m);
+    const BIGNUM *m);
 int bn_mul_fixed_top(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
 int bn_sqr_fixed_top(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
 int bn_lshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n);
 int bn_rshift_fixed_top(BIGNUM *r, const BIGNUM *a, int n);
 int bn_div_fixed_top(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
-                     const BIGNUM *d, BN_CTX *ctx);
+    const BIGNUM *d, BN_CTX *ctx);
 int ossl_bn_mask_bits_fixed_top(BIGNUM *a, int n);
 int ossl_bn_is_word_fixed_top(const BIGNUM *a, const BN_ULONG w);
 int ossl_bn_priv_rand_range_fixed_top(BIGNUM *r, const BIGNUM *range,
-                                      unsigned int strength, BN_CTX *ctx);
+    unsigned int strength, BN_CTX *ctx);
 int ossl_bn_gen_dsa_nonce_fixed_top(BIGNUM *out, const BIGNUM *range,
-                                    const BIGNUM *priv,
-                                    const unsigned char *message,
-                                    size_t message_len, BN_CTX *ctx);
+    const BIGNUM *priv,
+    const unsigned char *message,
+    size_t message_len, BN_CTX *ctx);
 
-#define BN_PRIMETEST_COMPOSITE                    0
-#define BN_PRIMETEST_COMPOSITE_WITH_FACTOR        1
+#define BN_PRIMETEST_COMPOSITE 0
+#define BN_PRIMETEST_COMPOSITE_WITH_FACTOR 1
 #define BN_PRIMETEST_COMPOSITE_NOT_POWER_OF_PRIME 2
-#define BN_PRIMETEST_PROBABLY_PRIME               3
+#define BN_PRIMETEST_PROBABLY_PRIME 3
 
 int ossl_bn_miller_rabin_is_prime(const BIGNUM *w, int iterations, BN_CTX *ctx,
-                                  BN_GENCB *cb, int enhanced, int *status);
+    BN_GENCB *cb, int enhanced, int *status);
 int ossl_bn_check_generated_prime(const BIGNUM *w, int checks, BN_CTX *ctx,
-                                  BN_GENCB *cb);
+    BN_GENCB *cb);
 
 const BIGNUM *ossl_bn_get0_small_factors(void);
 
 int ossl_bn_rsa_fips186_4_gen_prob_primes(BIGNUM *p, BIGNUM *Xpout,
-                                          BIGNUM *p1, BIGNUM *p2,
-                                          const BIGNUM *Xp, const BIGNUM *Xp1,
-                                          const BIGNUM *Xp2, int nlen,
-                                          const BIGNUM *e, BN_CTX *ctx,
-                                          BN_GENCB *cb);
+    BIGNUM *p1, BIGNUM *p2,
+    const BIGNUM *Xp, const BIGNUM *Xp1,
+    const BIGNUM *Xp2, int nlen,
+    const BIGNUM *e, BN_CTX *ctx,
+    BN_GENCB *cb);
 
 int ossl_bn_rsa_fips186_4_derive_prime(BIGNUM *Y, BIGNUM *X, const BIGNUM *Xin,
-                                       const BIGNUM *r1, const BIGNUM *r2,
-                                       int nlen, const BIGNUM *e, BN_CTX *ctx,
-                                       BN_GENCB *cb);
+    const BIGNUM *r1, const BIGNUM *r2,
+    int nlen, const BIGNUM *e, BN_CTX *ctx,
+    BN_GENCB *cb);
 
 OSSL_LIB_CTX *ossl_bn_get_libctx(BN_CTX *ctx);
 
 extern const BIGNUM ossl_bn_inv_sqrt_2;
 
-#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) && defined (__s390x__) \
-    && !defined (OPENSSL_NO_ASM)
-# define S390X_MOD_EXP
+#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE) && defined(__s390x__) \
+    && !defined(OPENSSL_NO_ASM)
+#define S390X_MOD_EXP
 #endif
 
 int s390x_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 int s390x_crt(BIGNUM *r, const BIGNUM *i, const BIGNUM *p, const BIGNUM *q,
-            const BIGNUM *dmp, const BIGNUM *dmq, const BIGNUM *iqmp);
+    const BIGNUM *dmp, const BIGNUM *dmq, const BIGNUM *iqmp);
 
 #endif
 
 int ossl_bn_mont_ctx_set(BN_MONT_CTX *ctx, const BIGNUM *modulus, int ri,
-                         const unsigned char *rr, size_t rrlen,
-                         uint32_t nlo, uint32_t nhi);
+    const unsigned char *rr, size_t rrlen,
+    uint32_t nlo, uint32_t nhi);
 
 int ossl_bn_mont_ctx_eq(const BN_MONT_CTX *m1, const BN_MONT_CTX *m2);
diff --git a/include/crypto/bn_conf.h.in b/include/crypto/bn_conf.h.in
index dbc901b145ea..1c1126fee069 100644
--- a/include/crypto/bn_conf.h.in
+++ b/include/crypto/bn_conf.h.in
@@ -1,4 +1,6 @@
+/* clang-format off */
 {- join("\n",map { "/* $_ */" } @autowarntext) -}
+/* clang-format on */
 /*
  * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +11,8 @@
  */
 
 #ifndef OSSL_CRYPTO_BN_CONF_H
-# define OSSL_CRYPTO_BN_CONF_H
-# pragma once
+#define OSSL_CRYPTO_BN_CONF_H
+#pragma once
 
 /*
  * The contents of this file are not used in the UEFI build, as
@@ -21,8 +23,14 @@
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
+/* clang-format off */
 {- $config{b64l} ? "#define" : "#undef" -} SIXTY_FOUR_BIT_LONG
+    /* clang-format on */
+    /* clang-format off */
 {- $config{b64}  ? "#define" : "#undef" -} SIXTY_FOUR_BIT
+    /* clang-format on */
+    /* clang-format off */
 {- $config{b32}  ? "#define" : "#undef" -} THIRTY_TWO_BIT
+/* clang-format on */
 
 #endif
diff --git a/include/crypto/bn_dh.h b/include/crypto/bn_dh.h
index 6d12c20e0212..a634a6f8f881 100644
--- a/include/crypto/bn_dh.h
+++ b/include/crypto/bn_dh.h
@@ -7,16 +7,16 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define declare_dh_bn(x) \
-    extern const BIGNUM ossl_bignum_dh##x##_p;              \
-    extern const BIGNUM ossl_bignum_dh##x##_q;              \
-    extern const BIGNUM ossl_bignum_dh##x##_g;              \
+#define declare_dh_bn(x)                       \
+    extern const BIGNUM ossl_bignum_dh##x##_p; \
+    extern const BIGNUM ossl_bignum_dh##x##_q; \
+    extern const BIGNUM ossl_bignum_dh##x##_g;
 
 declare_dh_bn(1024_160)
-declare_dh_bn(2048_224)
-declare_dh_bn(2048_256)
+    declare_dh_bn(2048_224)
+        declare_dh_bn(2048_256)
 
-extern const BIGNUM ossl_bignum_const_2;
+            extern const BIGNUM ossl_bignum_const_2;
 
 extern const BIGNUM ossl_bignum_ffdhe2048_p;
 extern const BIGNUM ossl_bignum_ffdhe3072_p;
diff --git a/include/crypto/bnerr.h b/include/crypto/bnerr.h
index 131e30fa71df..96b3a8dfba14 100644
--- a/include/crypto/bnerr.h
+++ b/include/crypto/bnerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_BNERR_H
-# define OSSL_CRYPTO_BNERR_H
-# pragma once
+#define OSSL_CRYPTO_BNERR_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_BN_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/buffererr.h b/include/crypto/buffererr.h
index 54976d95b5a8..21caac21f548 100644
--- a/include/crypto/buffererr.h
+++ b/include/crypto/buffererr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_BUFFERERR_H
-# define OSSL_CRYPTO_BUFFERERR_H
-# pragma once
+#define OSSL_CRYPTO_BUFFERERR_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_BUF_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h
index 2af2c2ecf7de..694cdda884fe 100644
--- a/include/crypto/chacha.h
+++ b/include/crypto/chacha.h
@@ -9,7 +9,7 @@
 
 #ifndef OSSL_CRYPTO_CHACHA_H
 #define OSSL_CRYPTO_CHACHA_H
-# pragma once
+#pragma once
 
 #include <stddef.h>
 
@@ -25,12 +25,12 @@
  * efficiency in multi-call scenarios.
  */
 void ChaCha20_ctr32(unsigned char *out, const unsigned char *inp,
-                    size_t len, const unsigned int key[8],
-                    const unsigned int counter[4]);
+    size_t len, const unsigned int key[8],
+    const unsigned int counter[4]);
 #ifdef INCLUDE_C_CHACHA20
 /* The fallback implementation for `ChaCha20_ctr32`. */
 void ChaCha20_ctr32_c(unsigned char *out, const unsigned char *inp, size_t len,
-                      const unsigned int key[8], const unsigned int counter[4]);
+    const unsigned int key[8], const unsigned int counter[4]);
 #endif
 
 /*
@@ -38,12 +38,11 @@ void ChaCha20_ctr32_c(unsigned char *out, const unsigned char *inp, size_t len,
  * as trivial as collecting bytes into 32-bit elements, it's reckoned
  * that below macro is sufficient.
  */
-#define CHACHA_U8TOU32(p)  ( \
-                ((unsigned int)(p)[0])     | ((unsigned int)(p)[1]<<8) | \
-                ((unsigned int)(p)[2]<<16) | ((unsigned int)(p)[3]<<24)  )
+#define CHACHA_U8TOU32(p) ( \
+    ((unsigned int)(p)[0]) | ((unsigned int)(p)[1] << 8) | ((unsigned int)(p)[2] << 16) | ((unsigned int)(p)[3] << 24))
 
-#define CHACHA_KEY_SIZE         32
-#define CHACHA_CTR_SIZE         16
-#define CHACHA_BLK_SIZE         64
+#define CHACHA_KEY_SIZE 32
+#define CHACHA_CTR_SIZE 16
+#define CHACHA_BLK_SIZE 64
 
 #endif
diff --git a/include/crypto/cmac.h b/include/crypto/cmac.h
index df55b68f8bc6..4f4eba949e17 100644
--- a/include/crypto/cmac.h
+++ b/include/crypto/cmac.h
@@ -8,15 +8,15 @@
  */
 
 #ifndef OSSL_CRYPTO_CMAC_H
-# define OSSL_CRYPTO_CMAC_H
-# pragma once
+#define OSSL_CRYPTO_CMAC_H
+#pragma once
 
-# include <openssl/types.h>
-# include <openssl/cmac.h>
-# include <openssl/params.h>
+#include <openssl/types.h>
+#include <openssl/cmac.h>
+#include <openssl/params.h>
 
 int ossl_cmac_init(CMAC_CTX *ctx, const void *key, size_t keylen,
-                   const EVP_CIPHER *cipher, ENGINE *impl,
-                   const OSSL_PARAM param[]);
+    const EVP_CIPHER *cipher, ENGINE *impl,
+    const OSSL_PARAM param[]);
 
-#endif  /* OSSL_CRYPTO_CMAC_H */
+#endif /* OSSL_CRYPTO_CMAC_H */
diff --git a/include/crypto/cmll_platform.h b/include/crypto/cmll_platform.h
index 8cadadf68aa0..02ed385c059a 100644
--- a/include/crypto/cmll_platform.h
+++ b/include/crypto/cmll_platform.h
@@ -8,44 +8,44 @@
  */
 
 #ifndef OSSL_CMLL_PLATFORM_H
-# define OSSL_CMLL_PLATFORM_H
-# pragma once
+#define OSSL_CMLL_PLATFORM_H
+#pragma once
 
-# if defined(CMLL_ASM) && (defined(__sparc) || defined(__sparc__))
+#if defined(CMLL_ASM) && (defined(__sparc) || defined(__sparc__))
 
 /* Fujitsu SPARC64 X support */
-#  include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
 
-#  ifndef OPENSSL_NO_CAMELLIA
-#   define SPARC_CMLL_CAPABLE      (OPENSSL_sparcv9cap_P[1] & CFR_CAMELLIA)
-#   include <openssl/camellia.h>
+#ifndef OPENSSL_NO_CAMELLIA
+#define SPARC_CMLL_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_CAMELLIA)
+#include <openssl/camellia.h>
 
 void cmll_t4_set_key(const unsigned char *key, int bits, CAMELLIA_KEY *ks);
 void cmll_t4_encrypt(const unsigned char *in, unsigned char *out,
-                     const CAMELLIA_KEY *key);
+    const CAMELLIA_KEY *key);
 void cmll_t4_decrypt(const unsigned char *in, unsigned char *out,
-                     const CAMELLIA_KEY *key);
+    const CAMELLIA_KEY *key);
 
 void cmll128_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                            size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+    size_t len, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void cmll128_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
-                            size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+    size_t len, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void cmll256_t4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                            size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+    size_t len, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void cmll256_t4_cbc_decrypt(const unsigned char *in, unsigned char *out,
-                            size_t len, const CAMELLIA_KEY *key,
-                            unsigned char *ivec, int /*unused*/);
+    size_t len, const CAMELLIA_KEY *key,
+    unsigned char *ivec, int /*unused*/);
 void cmll128_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-                              size_t blocks, const CAMELLIA_KEY *key,
-                              unsigned char *ivec);
+    size_t blocks, const CAMELLIA_KEY *key,
+    unsigned char *ivec);
 void cmll256_t4_ctr32_encrypt(const unsigned char *in, unsigned char *out,
-                              size_t blocks, const CAMELLIA_KEY *key,
-                              unsigned char *ivec);
-#  endif /* OPENSSL_NO_CAMELLIA */
+    size_t blocks, const CAMELLIA_KEY *key,
+    unsigned char *ivec);
+#endif /* OPENSSL_NO_CAMELLIA */
 
-# endif /* CMLL_ASM && sparc */
+#endif /* CMLL_ASM && sparc */
 
 #endif /* OSSL_CRYPTO_CIPHERMODE_PLATFORM_H */
diff --git a/include/crypto/cmperr.h b/include/crypto/cmperr.h
index 2bd163738466..ea3ac24d270c 100644
--- a/include/crypto/cmperr.h
+++ b/include/crypto/cmperr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_CMPERR_H
-# define OSSL_CRYPTO_CMPERR_H
-# pragma once
+#define OSSL_CRYPTO_CMPERR_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
 
-# ifndef OPENSSL_NO_CMP
+#ifndef OPENSSL_NO_CMP
 
 int ossl_err_load_CMP_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/cmserr.h b/include/crypto/cmserr.h
index f53530ae2352..f9fd933682e5 100644
--- a/include/crypto/cmserr.h
+++ b/include/crypto/cmserr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_CMSERR_H
-# define OSSL_CRYPTO_CMSERR_H
-# pragma once
+#define OSSL_CRYPTO_CMSERR_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
 
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
 
 int ossl_err_load_CMS_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/comperr.h b/include/crypto/comperr.h
index 0fd9c6de711a..b12b70cc8b07 100644
--- a/include/crypto/comperr.h
+++ b/include/crypto/comperr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_COMPERR_H
-# define OSSL_CRYPTO_COMPERR_H
-# pragma once
+#define OSSL_CRYPTO_COMPERR_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
 
-# ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
 
 int ossl_err_load_COMP_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/conferr.h b/include/crypto/conferr.h
index fc9645127d12..4e0474290bb5 100644
--- a/include/crypto/conferr.h
+++ b/include/crypto/conferr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_CONFERR_H
-# define OSSL_CRYPTO_CONFERR_H
-# pragma once
+#define OSSL_CRYPTO_CONFERR_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_CONF_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/crmferr.h b/include/crypto/crmferr.h
index f1a27e04993b..8216e7fcf74b 100644
--- a/include/crypto/crmferr.h
+++ b/include/crypto/crmferr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_CRMFERR_H
-# define OSSL_CRYPTO_CRMFERR_H
-# pragma once
+#define OSSL_CRYPTO_CRMFERR_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
 
-# ifndef OPENSSL_NO_CRMF
+#ifndef OPENSSL_NO_CRMF
 
 int ossl_err_load_CRMF_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/cryptlib.h b/include/crypto/cryptlib.h
index 39a956bfd362..242de6fc2f2f 100644
--- a/include/crypto/cryptlib.h
+++ b/include/crypto/cryptlib.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OSSL_CRYPTO_CRYPTLIB_H
-# define OSSL_CRYPTO_CRYPTLIB_H
-# pragma once
+#define OSSL_CRYPTO_CRYPTLIB_H
+#pragma once
 
-# include <openssl/core.h>
-# include "internal/cryptlib.h"
+#include <openssl/core.h>
+#include "internal/cryptlib.h"
 
 /* This file is not scanned by mkdef.pl, whereas cryptlib.h is */
 
 int ossl_init_thread_start(const void *index, void *arg,
-                           OSSL_thread_stop_handler_fn handfn);
+    OSSL_thread_stop_handler_fn handfn);
 int ossl_init_thread_deregister(void *index);
 int ossl_init_thread(void);
 void ossl_cleanup_thread(void);
@@ -28,12 +28,12 @@ void ossl_ctx_thread_stop(OSSL_LIB_CTX *ctx);
  * are those omitted from crypto.h because they are "reserved for internal
  * use".
  */
-# define OPENSSL_INIT_BASE_ONLY              0x00040000L
+#define OPENSSL_INIT_BASE_ONLY 0x00040000L
 
 void ossl_trace_cleanup(void);
 void ossl_malloc_setup_failures(void);
 
 int ossl_crypto_alloc_ex_data_intern(int class_index, void *obj,
-                                     CRYPTO_EX_DATA *ad, int idx);
+    CRYPTO_EX_DATA *ad, int idx);
 
-#endif  /* OSSL_CRYPTO_CRYPTLIB_H */
+#endif /* OSSL_CRYPTO_CRYPTLIB_H */
diff --git a/include/crypto/cryptoerr.h b/include/crypto/cryptoerr.h
index d7df9a2c02e8..f4a2389907a9 100644
--- a/include/crypto/cryptoerr.h
+++ b/include/crypto/cryptoerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_CRYPTOERR_H
-# define OSSL_CRYPTO_CRYPTOERR_H
-# pragma once
+#define OSSL_CRYPTO_CRYPTOERR_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_CRYPTO_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/cterr.h b/include/crypto/cterr.h
index 760bc796be4d..0af2d31516f8 100644
--- a/include/crypto/cterr.h
+++ b/include/crypto/cterr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_CTERR_H
-# define OSSL_CRYPTO_CTERR_H
-# pragma once
+#define OSSL_CRYPTO_CTERR_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
 
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 
 int ossl_err_load_CT_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/ctype.h b/include/crypto/ctype.h
index 22f6922183b5..a299ebbb8c3a 100644
--- a/include/crypto/ctype.h
+++ b/include/crypto/ctype.h
@@ -19,26 +19,26 @@
  * details.
  */
 #ifndef OSSL_CRYPTO_CTYPE_H
-# define OSSL_CRYPTO_CTYPE_H
-# pragma once
+#define OSSL_CRYPTO_CTYPE_H
+#pragma once
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# define CTYPE_MASK_lower       0x1
-# define CTYPE_MASK_upper       0x2
-# define CTYPE_MASK_digit       0x4
-# define CTYPE_MASK_space       0x8
-# define CTYPE_MASK_xdigit      0x10
-# define CTYPE_MASK_blank       0x20
-# define CTYPE_MASK_cntrl       0x40
-# define CTYPE_MASK_graph       0x80
-# define CTYPE_MASK_print       0x100
-# define CTYPE_MASK_punct       0x200
-# define CTYPE_MASK_base64      0x400
-# define CTYPE_MASK_asn1print   0x800
+#define CTYPE_MASK_lower 0x1
+#define CTYPE_MASK_upper 0x2
+#define CTYPE_MASK_digit 0x4
+#define CTYPE_MASK_space 0x8
+#define CTYPE_MASK_xdigit 0x10
+#define CTYPE_MASK_blank 0x20
+#define CTYPE_MASK_cntrl 0x40
+#define CTYPE_MASK_graph 0x80
+#define CTYPE_MASK_print 0x100
+#define CTYPE_MASK_punct 0x200
+#define CTYPE_MASK_base64 0x400
+#define CTYPE_MASK_asn1print 0x800
 
-# define CTYPE_MASK_alpha   (CTYPE_MASK_lower | CTYPE_MASK_upper)
-# define CTYPE_MASK_alnum   (CTYPE_MASK_alpha | CTYPE_MASK_digit)
+#define CTYPE_MASK_alpha (CTYPE_MASK_lower | CTYPE_MASK_upper)
+#define CTYPE_MASK_alnum (CTYPE_MASK_alpha | CTYPE_MASK_digit)
 
 /*
  * The ascii mask assumes that any other classification implies that
@@ -47,15 +47,15 @@
  *
  * This assumption holds at the moment, but it might not in the future.
  */
-# define CTYPE_MASK_ascii   (~0)
+#define CTYPE_MASK_ascii (~0)
 
-# ifdef CHARSET_EBCDIC
+#ifdef CHARSET_EBCDIC
 int ossl_toascii(int c);
 int ossl_fromascii(int c);
-# else
-#  define ossl_toascii(c)       (c)
-#  define ossl_fromascii(c)     (c)
-# endif
+#else
+#define ossl_toascii(c) (c)
+#define ossl_fromascii(c) (c)
+#endif
 int ossl_ctype_check(int c, unsigned int mask);
 
 int ossl_tolower(int c);
@@ -67,20 +67,20 @@ int ossl_isupper(int c);
 
 int ossl_ascii_isdigit(int c);
 
-# define ossl_isalnum(c)        (ossl_ctype_check((c), CTYPE_MASK_alnum))
-# define ossl_isalpha(c)        (ossl_ctype_check((c), CTYPE_MASK_alpha))
-# ifdef CHARSET_EBCDIC
-# define ossl_isascii(c)        (ossl_ctype_check((c), CTYPE_MASK_ascii))
-# else
-# define ossl_isascii(c)        (((c) & ~127) == 0)
-# endif
-# define ossl_isblank(c)        (ossl_ctype_check((c), CTYPE_MASK_blank))
-# define ossl_iscntrl(c)        (ossl_ctype_check((c), CTYPE_MASK_cntrl))
-# define ossl_isgraph(c)        (ossl_ctype_check((c), CTYPE_MASK_graph))
-# define ossl_isprint(c)        (ossl_ctype_check((c), CTYPE_MASK_print))
-# define ossl_ispunct(c)        (ossl_ctype_check((c), CTYPE_MASK_punct))
-# define ossl_isspace(c)        (ossl_ctype_check((c), CTYPE_MASK_space))
-# define ossl_isxdigit(c)       (ossl_ctype_check((c), CTYPE_MASK_xdigit))
-# define ossl_isbase64(c)       (ossl_ctype_check((c), CTYPE_MASK_base64))
-# define ossl_isasn1print(c)    (ossl_ctype_check((c), CTYPE_MASK_asn1print))
+#define ossl_isalnum(c) (ossl_ctype_check((c), CTYPE_MASK_alnum))
+#define ossl_isalpha(c) (ossl_ctype_check((c), CTYPE_MASK_alpha))
+#ifdef CHARSET_EBCDIC
+#define ossl_isascii(c) (ossl_ctype_check((c), CTYPE_MASK_ascii))
+#else
+#define ossl_isascii(c) (((c) & ~127) == 0)
+#endif
+#define ossl_isblank(c) (ossl_ctype_check((c), CTYPE_MASK_blank))
+#define ossl_iscntrl(c) (ossl_ctype_check((c), CTYPE_MASK_cntrl))
+#define ossl_isgraph(c) (ossl_ctype_check((c), CTYPE_MASK_graph))
+#define ossl_isprint(c) (ossl_ctype_check((c), CTYPE_MASK_print))
+#define ossl_ispunct(c) (ossl_ctype_check((c), CTYPE_MASK_punct))
+#define ossl_isspace(c) (ossl_ctype_check((c), CTYPE_MASK_space))
+#define ossl_isxdigit(c) (ossl_ctype_check((c), CTYPE_MASK_xdigit))
+#define ossl_isbase64(c) (ossl_ctype_check((c), CTYPE_MASK_base64))
+#define ossl_isasn1print(c) (ossl_ctype_check((c), CTYPE_MASK_asn1print))
 #endif
diff --git a/include/crypto/decoder.h b/include/crypto/decoder.h
index 15299a082856..fcb914faeb65 100644
--- a/include/crypto/decoder.h
+++ b/include/crypto/decoder.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_CRYPTO_DECODER_H
-# define OSSL_CRYPTO_DECODER_H
-# pragma once
+#define OSSL_CRYPTO_DECODER_H
+#pragma once
 
-# include <openssl/decoder.h>
+#include <openssl/decoder.h>
 
 /*
  * These are specially made for the 'file:' provider-native loader, which
@@ -20,11 +20,11 @@
  * (provider-object(7)).
  */
 void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef,
-                                  OSSL_PROVIDER *prov);
+    OSSL_PROVIDER *prov);
 
 OSSL_DECODER_INSTANCE *
 ossl_decoder_instance_new_forprov(OSSL_DECODER *decoder, void *provctx,
-                                  const char *input_structure);
+    const char *input_structure);
 OSSL_DECODER_INSTANCE *
 ossl_decoder_instance_new(OSSL_DECODER *decoder, void *decoderctx);
 void ossl_decoder_instance_free(OSSL_DECODER_INSTANCE *decoder_inst);
@@ -32,7 +32,7 @@ int ossl_decoder_ctx_get_harderr(const OSSL_DECODER_CTX *ctx);
 void ossl_decoder_ctx_set_harderr(OSSL_DECODER_CTX *ctx);
 OSSL_DECODER_INSTANCE *ossl_decoder_instance_dup(const OSSL_DECODER_INSTANCE *src);
 int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx,
-                                      OSSL_DECODER_INSTANCE *di);
+    OSSL_DECODER_INSTANCE *di);
 
 int ossl_decoder_get_number(const OSSL_DECODER *encoder);
 int ossl_decoder_store_cache_flush(OSSL_LIB_CTX *libctx);
diff --git a/include/crypto/decodererr.h b/include/crypto/decodererr.h
index d7badc43793c..c1aadca3652d 100644
--- a/include/crypto/decodererr.h
+++ b/include/crypto/decodererr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_DECODERERR_H
-# define OSSL_CRYPTO_DECODERERR_H
-# pragma once
+#define OSSL_CRYPTO_DECODERERR_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_OSSL_DECODER_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/des_platform.h b/include/crypto/des_platform.h
index 07ea1ddd0acc..e0210c664f76 100644
--- a/include/crypto/des_platform.h
+++ b/include/crypto/des_platform.h
@@ -8,28 +8,28 @@
  */
 
 #ifndef OSSL_DES_PLATFORM_H
-# define OSSL_DES_PLATFORM_H
-# pragma once
+#define OSSL_DES_PLATFORM_H
+#pragma once
 
-# if defined(DES_ASM) && (defined(__sparc) || defined(__sparc__))
+#if defined(DES_ASM) && (defined(__sparc) || defined(__sparc__))
 
 /* Fujitsu SPARC64 X support */
-#  include "crypto/sparc_arch.h"
+#include "crypto/sparc_arch.h"
 
-#  ifndef OPENSSL_NO_DES
-#   define SPARC_DES_CAPABLE      (OPENSSL_sparcv9cap_P[1] & CFR_DES)
-#   include <openssl/des.h>
+#ifndef OPENSSL_NO_DES
+#define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)
+#include <openssl/des.h>
 void des_t4_key_expand(const void *key, DES_key_schedule *ks);
 void des_t4_ede3_cbc_encrypt(const void *inp, void *out, size_t len,
-                             const DES_key_schedule ks[3], unsigned char iv[8]);
+    const DES_key_schedule ks[3], unsigned char iv[8]);
 void des_t4_ede3_cbc_decrypt(const void *inp, void *out, size_t len,
-                             const DES_key_schedule ks[3], unsigned char iv[8]);
+    const DES_key_schedule ks[3], unsigned char iv[8]);
 void des_t4_cbc_encrypt(const void *inp, void *out, size_t len,
-                        const DES_key_schedule *ks, unsigned char iv[8]);
+    const DES_key_schedule *ks, unsigned char iv[8]);
 void des_t4_cbc_decrypt(const void *inp, void *out, size_t len,
-                        const DES_key_schedule *ks, unsigned char iv[8]);
-#  endif /* OPENSSL_NO_DES */
+    const DES_key_schedule *ks, unsigned char iv[8]);
+#endif /* OPENSSL_NO_DES */
 
-# endif /* DES_ASM && sparc */
+#endif /* DES_ASM && sparc */
 
 #endif /* OSSL_CRYPTO_CIPHERMODE_PLATFORM_H */
diff --git a/include/crypto/dh.h b/include/crypto/dh.h
index b4a4a3c1fae8..89f25c049df1 100644
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -8,21 +8,21 @@
  */
 
 #ifndef OSSL_CRYPTO_DH_H
-# define OSSL_CRYPTO_DH_H
-# pragma once
+#define OSSL_CRYPTO_DH_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/params.h>
-# include <openssl/dh.h>
-# include "internal/ffc.h"
+#include <openssl/core.h>
+#include <openssl/params.h>
+#include <openssl/dh.h>
+#include "internal/ffc.h"
 
 DH *ossl_dh_new_by_nid_ex(OSSL_LIB_CTX *libctx, int nid);
 DH *ossl_dh_new_ex(OSSL_LIB_CTX *libctx);
 void ossl_dh_set0_libctx(DH *d, OSSL_LIB_CTX *libctx);
 int ossl_dh_generate_ffc_parameters(DH *dh, int type, int pbits, int qbits,
-                                    BN_GENCB *cb);
+    BN_GENCB *cb);
 int ossl_dh_generate_public_key(BN_CTX *ctx, const DH *dh,
-                                const BIGNUM *priv_key, BIGNUM *pub_key);
+    const BIGNUM *priv_key, BIGNUM *pub_key);
 int ossl_dh_get_named_group_uid_from_size(int pbits);
 const char *ossl_dh_gen_type_id2name(int id);
 int ossl_dh_gen_type_name2id(const char *name, int type);
@@ -35,9 +35,9 @@ int ossl_dh_params_fromdata(DH *dh, const OSSL_PARAM params[]);
 int ossl_dh_key_fromdata(DH *dh, const OSSL_PARAM params[], int include_private);
 int ossl_dh_params_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[]);
 int ossl_dh_key_todata(DH *dh, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
-                       int include_private);
+    int include_private);
 DH *ossl_dh_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
-                           OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int ossl_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
 
 int ossl_dh_check_pub_key_partial(const DH *dh, const BIGNUM *pub_key, int *ret);
@@ -48,15 +48,15 @@ const DH_METHOD *ossl_dh_get_method(const DH *dh);
 
 int ossl_dh_buf2key(DH *key, const unsigned char *buf, size_t len);
 size_t ossl_dh_key2buf(const DH *dh, unsigned char **pbuf, size_t size,
-                       int alloc);
+    int alloc);
 
 int ossl_dh_kdf_X9_42_asn1(unsigned char *out, size_t outlen,
-                           const unsigned char *Z, size_t Zlen,
-                           const char *cek_alg,
-                           const unsigned char *ukm, size_t ukmlen,
-                           const EVP_MD *md,
-                           OSSL_LIB_CTX *libctx, const char *propq);
+    const unsigned char *Z, size_t Zlen,
+    const char *cek_alg,
+    const unsigned char *ukm, size_t ukmlen,
+    const EVP_MD *md,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int ossl_dh_is_foreign(const DH *dh);
 DH *ossl_dh_dup(const DH *dh, int selection);
 
-#endif  /* OSSL_CRYPTO_DH_H */
+#endif /* OSSL_CRYPTO_DH_H */
diff --git a/include/crypto/dherr.h b/include/crypto/dherr.h
index 519327f79574..00ea8fe667ba 100644
--- a/include/crypto/dherr.h
+++ b/include/crypto/dherr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_DHERR_H
-# define OSSL_CRYPTO_DHERR_H
-# pragma once
+#define OSSL_CRYPTO_DHERR_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
 
-# ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 
 int ossl_err_load_DH_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/dsa.h b/include/crypto/dsa.h
index b08a42c7f286..73a61e7a88ba 100644
--- a/include/crypto/dsa.h
+++ b/include/crypto/dsa.h
@@ -8,46 +8,46 @@
  */
 
 #ifndef OSSL_CRYPTO_DSA_H
-# define OSSL_CRYPTO_DSA_H
-# pragma once
+#define OSSL_CRYPTO_DSA_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/dsa.h>
-# include "internal/ffc.h"
+#include <openssl/core.h>
+#include <openssl/dsa.h>
+#include "internal/ffc.h"
 
 /*
  * DSA Paramgen types
  * Note, adding to this list requires adjustments to various checks
  * in dsa_gen range validation checks
  */
-#define DSA_PARAMGEN_TYPE_FIPS_186_4   0   /* Use FIPS186-4 standard */
-#define DSA_PARAMGEN_TYPE_FIPS_186_2   1   /* Use legacy FIPS186-2 standard */
+#define DSA_PARAMGEN_TYPE_FIPS_186_4 0 /* Use FIPS186-4 standard */
+#define DSA_PARAMGEN_TYPE_FIPS_186_2 1 /* Use legacy FIPS186-2 standard */
 #define DSA_PARAMGEN_TYPE_FIPS_DEFAULT 2
 
 DSA *ossl_dsa_new(OSSL_LIB_CTX *libctx);
 void ossl_dsa_set0_libctx(DSA *d, OSSL_LIB_CTX *libctx);
 
 int ossl_dsa_generate_ffc_parameters(DSA *dsa, int type, int pbits, int qbits,
-                                     BN_GENCB *cb);
+    BN_GENCB *cb);
 
 int ossl_dsa_sign_int(int type, const unsigned char *dgst, int dlen,
-                      unsigned char *sig, unsigned int *siglen, DSA *dsa,
-                      unsigned int nonce_type, const char *digestname,
-                      OSSL_LIB_CTX *libctx, const char *propq);
+    unsigned char *sig, unsigned int *siglen, DSA *dsa,
+    unsigned int nonce_type, const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 FFC_PARAMS *ossl_dsa_get0_params(DSA *dsa);
 int ossl_dsa_ffc_params_fromdata(DSA *dsa, const OSSL_PARAM params[]);
 int ossl_dsa_key_fromdata(DSA *dsa, const OSSL_PARAM params[],
-                          int include_private);
+    int include_private);
 DSA *ossl_dsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_dsa_generate_public_key(BN_CTX *ctx, const DSA *dsa,
-                                 const BIGNUM *priv_key, BIGNUM *pub_key);
+    const BIGNUM *priv_key, BIGNUM *pub_key);
 int ossl_dsa_check_params(const DSA *dsa, int checktype, int *ret);
 int ossl_dsa_check_pub_key(const DSA *dsa, const BIGNUM *pub_key, int *ret);
 int ossl_dsa_check_pub_key_partial(const DSA *dsa, const BIGNUM *pub_key,
-                                   int *ret);
+    int *ret);
 int ossl_dsa_check_priv_key(const DSA *dsa, const BIGNUM *priv_key, int *ret);
 int ossl_dsa_check_pairwise(const DSA *dsa);
 int ossl_dsa_is_foreign(const DSA *dsa);
diff --git a/include/crypto/dsaerr.h b/include/crypto/dsaerr.h
index fde8358fc96d..f4a886b1ac53 100644
--- a/include/crypto/dsaerr.h
+++ b/include/crypto/dsaerr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_DSAERR_H
-# define OSSL_CRYPTO_DSAERR_H
-# pragma once
+#define OSSL_CRYPTO_DSAERR_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
 
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 
 int ossl_err_load_DSA_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/dso_conf.h.in b/include/crypto/dso_conf.h.in
index 12de11ade8da..8cd634a6e603 100644
--- a/include/crypto/dso_conf.h.in
+++ b/include/crypto/dso_conf.h.in
@@ -1,4 +1,6 @@
+/* clang-format off */
 {- join("\n",map { "/* $_ */" } @autowarntext) -}
+/* clang-format on */
 /*
  * Copyright 2016-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,9 +11,10 @@
  */
 
 #ifndef OSSL_CRYPTO_DSO_CONF_H
-# define OSSL_CRYPTO_DSO_CONF_H
-# pragma once
+#define OSSL_CRYPTO_DSO_CONF_H
+#pragma once
 
+/* clang-format off */
 {-  # The DSO code currently always implements all functions so that no
     # applications will have to worry about that from a compilation point
     # of view. However, the "method"s may return zero unless that platform
@@ -29,5 +32,8 @@
         @macros = ( "DSO_DLFCN" );
     }
     join("\n", map { "# define $_" } @macros); -}
+/* clang-format on */
+/* clang-format off */
 # define DSO_EXTENSION "{- platform->dsoext() -}"
+/* clang-format on */
 #endif
diff --git a/include/crypto/ec.h b/include/crypto/ec.h
index da85a7bd88d7..22f614cccd3e 100644
--- a/include/crypto/ec.h
+++ b/include/crypto/ec.h
@@ -10,21 +10,21 @@
 /* Internal EC functions for other submodules: not for application use */
 
 #ifndef OSSL_CRYPTO_EC_H
-# define OSSL_CRYPTO_EC_H
-# pragma once
+#define OSSL_CRYPTO_EC_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/evp.h>
+#include <openssl/opensslconf.h>
+#include <openssl/evp.h>
 
 int ossl_ec_curve_name2nid(const char *name);
 const char *ossl_ec_curve_nid2nist_int(int nid);
 int ossl_ec_curve_nist2nid_int(const char *name);
 int evp_pkey_ctx_set_ec_param_enc_prov(EVP_PKEY_CTX *ctx, int param_enc);
 
-# ifndef OPENSSL_NO_EC
-#  include <openssl/core.h>
-#  include <openssl/ec.h>
-#  include "crypto/types.h"
+#ifndef OPENSSL_NO_EC
+#include <openssl/core.h>
+#include <openssl/ec.h>
+#include "crypto/types.h"
 
 /*-
  * Computes the multiplicative inverse of x in the range
@@ -48,16 +48,16 @@ int evp_pkey_ctx_set_ec_param_enc_prov(EVP_PKEY_CTX *ctx, int param_enc);
  * implementations for better SCA properties on regular input values).
  */
 __owur int ossl_ec_group_do_inverse_ord(const EC_GROUP *group, BIGNUM *res,
-                                        const BIGNUM *x, BN_CTX *ctx);
+    const BIGNUM *x, BN_CTX *ctx);
 
 /*-
  * ECDH Key Derivation Function as defined in ANSI X9.63
  */
 int ossl_ecdh_kdf_X9_63(unsigned char *out, size_t outlen,
-                        const unsigned char *Z, size_t Zlen,
-                        const unsigned char *sinfo, size_t sinfolen,
-                        const EVP_MD *md, OSSL_LIB_CTX *libctx,
-                        const char *propq);
+    const unsigned char *Z, size_t Zlen,
+    const unsigned char *sinfo, size_t sinfolen,
+    const EVP_MD *md, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 int ossl_ec_key_public_check(const EC_KEY *eckey, BN_CTX *ctx);
 int ossl_ec_key_public_check_quick(const EC_KEY *eckey, BN_CTX *ctx);
@@ -69,22 +69,22 @@ void ossl_ec_key_set0_libctx(EC_KEY *key, OSSL_LIB_CTX *libctx);
 
 /* Backend support */
 int ossl_ec_group_todata(const EC_GROUP *group, OSSL_PARAM_BLD *tmpl,
-                         OSSL_PARAM params[], OSSL_LIB_CTX *libctx,
-                         const char *propq,
-                         BN_CTX *bnctx, unsigned char **genbuf);
+    OSSL_PARAM params[], OSSL_LIB_CTX *libctx,
+    const char *propq,
+    BN_CTX *bnctx, unsigned char **genbuf);
 int ossl_ec_group_fromdata(EC_KEY *ec, const OSSL_PARAM params[]);
 int ossl_ec_group_set_params(EC_GROUP *group, const OSSL_PARAM params[]);
 int ossl_ec_key_fromdata(EC_KEY *ecx, const OSSL_PARAM params[],
-                         int include_private);
+    int include_private);
 int ossl_ec_key_otherparams_fromdata(EC_KEY *ec, const OSSL_PARAM params[]);
 int ossl_ec_key_is_foreign(const EC_KEY *ec);
 EC_KEY *ossl_ec_key_dup(const EC_KEY *key, int selection);
 int ossl_x509_algor_is_sm2(const X509_ALGOR *palg);
 EC_KEY *ossl_ec_key_param_from_x509_algor(const X509_ALGOR *palg,
-                                          OSSL_LIB_CTX *libctx,
-                                          const char *propq);
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 EC_KEY *ossl_ec_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_ec_set_ecdh_cofactor_mode(EC_KEY *ec, int mode);
 int ossl_ec_encoding_name2id(const char *name);
@@ -96,11 +96,11 @@ char *ossl_ec_pt_format_id2name(int id);
 char *ossl_ec_check_group_type_id2name(int flags);
 int ossl_ec_set_check_group_type_from_name(EC_KEY *ec, const char *name);
 int ossl_ec_generate_key_dhkem(EC_KEY *eckey,
-                               const unsigned char *ikm, size_t ikmlen);
+    const unsigned char *ikm, size_t ikmlen);
 int ossl_ecdsa_deterministic_sign(const unsigned char *dgst, int dlen,
-                                  unsigned char *sig, unsigned int *siglen,
-                                  EC_KEY *eckey, unsigned int nonce_type,
-                                  const char *digestname,
-                                  OSSL_LIB_CTX *libctx, const char *propq);
-# endif /* OPENSSL_NO_EC */
+    unsigned char *sig, unsigned int *siglen,
+    EC_KEY *eckey, unsigned int nonce_type,
+    const char *digestname,
+    OSSL_LIB_CTX *libctx, const char *propq);
+#endif /* OPENSSL_NO_EC */
 #endif
diff --git a/include/crypto/ecerr.h b/include/crypto/ecerr.h
index 782526bf8565..22003a3025ca 100644
--- a/include/crypto/ecerr.h
+++ b/include/crypto/ecerr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_ECERR_H
-# define OSSL_CRYPTO_ECERR_H
-# pragma once
+#define OSSL_CRYPTO_ECERR_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
 
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 
 int ossl_err_load_EC_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/ecx.h b/include/crypto/ecx.h
index 0e8828e54665..f388b2e000e8 100644
--- a/include/crypto/ecx.h
+++ b/include/crypto/ecx.h
@@ -10,42 +10,41 @@
 /* Internal EC functions for other submodules: not for application use */
 
 #ifndef OSSL_CRYPTO_ECX_H
-# define OSSL_CRYPTO_ECX_H
-# pragma once
+#define OSSL_CRYPTO_ECX_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_ECX
+#ifndef OPENSSL_NO_ECX
 
-#  include <openssl/core.h>
-#  include <openssl/e_os2.h>
-#  include <openssl/crypto.h>
-#  include "internal/refcount.h"
-#  include "crypto/types.h"
+#include <openssl/core.h>
+#include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+#include "internal/refcount.h"
+#include "crypto/types.h"
 
-#  define X25519_KEYLEN         32
-#  define X448_KEYLEN           56
-#  define ED25519_KEYLEN        32
-#  define ED448_KEYLEN          57
+#define X25519_KEYLEN 32
+#define X448_KEYLEN 56
+#define ED25519_KEYLEN 32
+#define ED448_KEYLEN 57
 
-#  define MAX_KEYLEN  ED448_KEYLEN
+#define MAX_KEYLEN ED448_KEYLEN
 
-#  define X25519_BITS           253
-#  define X25519_SECURITY_BITS  128
+#define X25519_BITS 253
+#define X25519_SECURITY_BITS 128
 
-#  define X448_BITS             448
-#  define X448_SECURITY_BITS    224
+#define X448_BITS 448
+#define X448_SECURITY_BITS 224
 
-#  define ED25519_BITS          256
+#define ED25519_BITS 256
 /* RFC8032 Section 8.5 */
-#  define ED25519_SECURITY_BITS 128
-#  define ED25519_SIGSIZE       64
+#define ED25519_SECURITY_BITS 128
+#define ED25519_SIGSIZE 64
 
-#  define ED448_BITS            456
+#define ED448_BITS 456
 /* RFC8032 Section 8.5 */
-#  define ED448_SECURITY_BITS   224
-#  define ED448_SIGSIZE         114
-
+#define ED448_SECURITY_BITS 224
+#define ED448_SIGSIZE 114
 
 typedef enum {
     ECX_KEY_TYPE_X25519,
@@ -54,19 +53,19 @@ typedef enum {
     ECX_KEY_TYPE_ED448
 } ECX_KEY_TYPE;
 
-#define KEYTYPE2NID(type) \
-    ((type) == ECX_KEY_TYPE_X25519 \
-     ?  EVP_PKEY_X25519 \
-     : ((type) == ECX_KEY_TYPE_X448 \
-        ? EVP_PKEY_X448 \
-        : ((type) == ECX_KEY_TYPE_ED25519 \
-           ? EVP_PKEY_ED25519 \
-           : EVP_PKEY_ED448)))
+#define KEYTYPE2NID(type)                               \
+    ((type) == ECX_KEY_TYPE_X25519                      \
+            ? EVP_PKEY_X25519                           \
+            : ((type) == ECX_KEY_TYPE_X448              \
+                      ? EVP_PKEY_X448                   \
+                      : ((type) == ECX_KEY_TYPE_ED25519 \
+                                ? EVP_PKEY_ED25519      \
+                                : EVP_PKEY_ED448)))
 
 struct ecx_key_st {
     OSSL_LIB_CTX *libctx;
     char *propq;
-    unsigned int haspubkey:1;
+    unsigned int haspubkey : 1;
     unsigned char pubkey[MAX_KEYLEN];
     unsigned char *privkey;
     size_t keylen;
@@ -76,66 +75,55 @@ struct ecx_key_st {
 
 size_t ossl_ecx_key_length(ECX_KEY_TYPE type);
 ECX_KEY *ossl_ecx_key_new(OSSL_LIB_CTX *libctx, ECX_KEY_TYPE type,
-                          int haspubkey, const char *propq);
+    int haspubkey, const char *propq);
 void ossl_ecx_key_set0_libctx(ECX_KEY *key, OSSL_LIB_CTX *libctx);
 unsigned char *ossl_ecx_key_allocate_privkey(ECX_KEY *key);
 void ossl_ecx_key_free(ECX_KEY *key);
 int ossl_ecx_key_up_ref(ECX_KEY *key);
 ECX_KEY *ossl_ecx_key_dup(const ECX_KEY *key, int selection);
 int ossl_ecx_compute_key(ECX_KEY *peer, ECX_KEY *priv, size_t keylen,
-                         unsigned char *secret, size_t *secretlen,
-                         size_t outlen);
+    unsigned char *secret, size_t *secretlen,
+    size_t outlen);
 
 int ossl_x25519(uint8_t out_shared_key[32], const uint8_t private_key[32],
-                const uint8_t peer_public_value[32]);
+    const uint8_t peer_public_value[32]);
 void ossl_x25519_public_from_private(uint8_t out_public_value[32],
-                                     const uint8_t private_key[32]);
-
-int
-ossl_ed25519_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
-                                 const uint8_t private_key[32],
-                                 const char *propq);
-int
-ossl_ed25519_sign(uint8_t *out_sig, const uint8_t *tbs, size_t tbs_len,
-                  const uint8_t public_key[32], const uint8_t private_key[32],
-                  const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
-                  const uint8_t *context, size_t context_len,
-                  OSSL_LIB_CTX *libctx, const char *propq);
-int
-ossl_ed25519_verify(const uint8_t *tbs, size_t tbs_len,
-                    const uint8_t signature[64], const uint8_t public_key[32],
-                    const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
-                    const uint8_t *context, size_t context_len,
-                    OSSL_LIB_CTX *libctx, const char *propq);
-int
-ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len);
-int
-ossl_ed448_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[57],
-                               const uint8_t private_key[57], const char *propq);
-int
-ossl_ed448_sign(OSSL_LIB_CTX *ctx, uint8_t *out_sig,
-                const uint8_t *message, size_t message_len,
-                const uint8_t public_key[57], const uint8_t private_key[57],
-                const uint8_t *context, size_t context_len,
-                const uint8_t phflag, const char *propq);
+    const uint8_t private_key[32]);
 
-int
-ossl_ed448_verify(OSSL_LIB_CTX *ctx,
-                  const uint8_t *message, size_t message_len,
-                  const uint8_t signature[114], const uint8_t public_key[57],
-                  const uint8_t *context, size_t context_len,
-                  const uint8_t phflag, const char *propq);
+int ossl_ed25519_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[32],
+    const uint8_t private_key[32],
+    const char *propq);
+int ossl_ed25519_sign(uint8_t *out_sig, const uint8_t *tbs, size_t tbs_len,
+    const uint8_t public_key[32], const uint8_t private_key[32],
+    const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
+    const uint8_t *context, size_t context_len,
+    OSSL_LIB_CTX *libctx, const char *propq);
+int ossl_ed25519_verify(const uint8_t *tbs, size_t tbs_len,
+    const uint8_t signature[64], const uint8_t public_key[32],
+    const uint8_t dom2flag, const uint8_t phflag, const uint8_t csflag,
+    const uint8_t *context, size_t context_len,
+    OSSL_LIB_CTX *libctx, const char *propq);
+int ossl_ed25519_pubkey_verify(const uint8_t *pub, size_t pub_len);
+int ossl_ed448_public_from_private(OSSL_LIB_CTX *ctx, uint8_t out_public_key[57],
+    const uint8_t private_key[57], const char *propq);
+int ossl_ed448_sign(OSSL_LIB_CTX *ctx, uint8_t *out_sig,
+    const uint8_t *message, size_t message_len,
+    const uint8_t public_key[57], const uint8_t private_key[57],
+    const uint8_t *context, size_t context_len,
+    const uint8_t phflag, const char *propq);
 
-int
-ossl_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len);
+int ossl_ed448_verify(OSSL_LIB_CTX *ctx,
+    const uint8_t *message, size_t message_len,
+    const uint8_t signature[114], const uint8_t public_key[57],
+    const uint8_t *context, size_t context_len,
+    const uint8_t phflag, const char *propq);
 
-int
-ossl_x448(uint8_t out_shared_key[56], const uint8_t private_key[56],
-          const uint8_t peer_public_value[56]);
-void
-ossl_x448_public_from_private(uint8_t out_public_value[56],
-                              const uint8_t private_key[56]);
+int ossl_ed448_pubkey_verify(const uint8_t *pub, size_t pub_len);
 
+int ossl_x448(uint8_t out_shared_key[56], const uint8_t private_key[56],
+    const uint8_t peer_public_value[56]);
+void ossl_x448_public_from_private(uint8_t out_public_value[56],
+    const uint8_t private_key[56]);
 
 /* Backend support */
 typedef enum {
@@ -145,19 +133,19 @@ typedef enum {
 } ecx_key_op_t;
 
 ECX_KEY *ossl_ecx_key_op(const X509_ALGOR *palg,
-                         const unsigned char *p, int plen,
-                         int pkey_id, ecx_key_op_t op,
-                         OSSL_LIB_CTX *libctx, const char *propq);
+    const unsigned char *p, int plen,
+    int pkey_id, ecx_key_op_t op,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_ecx_public_from_private(ECX_KEY *key);
 int ossl_ecx_key_fromdata(ECX_KEY *ecx, const OSSL_PARAM params[],
-                          int include_private);
+    int include_private);
 ECX_KEY *ossl_ecx_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
-                                 OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 ECX_KEY *ossl_evp_pkey_get1_X25519(EVP_PKEY *pkey);
 ECX_KEY *ossl_evp_pkey_get1_X448(EVP_PKEY *pkey);
 ECX_KEY *ossl_evp_pkey_get1_ED25519(EVP_PKEY *pkey);
 ECX_KEY *ossl_evp_pkey_get1_ED448(EVP_PKEY *pkey);
-# endif /* OPENSSL_NO_ECX */
+#endif /* OPENSSL_NO_ECX */
 #endif
diff --git a/include/crypto/encoder.h b/include/crypto/encoder.h
index 6240438d6d2a..7d278e50360f 100644
--- a/include/crypto/encoder.h
+++ b/include/crypto/encoder.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_CRYPTO_ENCODER_H
-# define OSSL_CRYPTO_ENCODER_H
-# pragma once
+#define OSSL_CRYPTO_ENCODER_H
+#pragma once
 
-# include <openssl/types.h>
+#include <openssl/types.h>
 
 int ossl_encoder_get_number(const OSSL_ENCODER *encoder);
 int ossl_encoder_store_cache_flush(OSSL_LIB_CTX *libctx);
diff --git a/include/crypto/encodererr.h b/include/crypto/encodererr.h
index 56c458234bdd..db930a5dc2d0 100644
--- a/include/crypto/encodererr.h
+++ b/include/crypto/encodererr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_ENCODERERR_H
-# define OSSL_CRYPTO_ENCODERERR_H
-# pragma once
+#define OSSL_CRYPTO_ENCODERERR_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_OSSL_ENCODER_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/engineerr.h b/include/crypto/engineerr.h
index 737c841d645a..e5d3c572c88a 100644
--- a/include/crypto/engineerr.h
+++ b/include/crypto/engineerr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_ENGINEERR_H
-# define OSSL_CRYPTO_ENGINEERR_H
-# pragma once
+#define OSSL_CRYPTO_ENGINEERR_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
 
-# ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 
 int ossl_err_load_ENGINE_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/err.h b/include/crypto/err.h
index 15ec6fd0390a..05a2eceb553b 100644
--- a/include/crypto/err.h
+++ b/include/crypto/err.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_CRYPTO_ERR_H
-# define OSSL_CRYPTO_ERR_H
-# pragma once
+#define OSSL_CRYPTO_ERR_H
+#pragma once
 
 int ossl_err_load_ERR_strings(void);
 int ossl_err_load_crypto_strings(void);
diff --git a/include/crypto/ess.h b/include/crypto/ess.h
index 7acde5f8a4f5..c29752117e40 100644
--- a/include/crypto/ess.h
+++ b/include/crypto/ess.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_CRYPTO_ESS_H
-# define OSSL_CRYPTO_ESS_H
-# pragma once
+#define OSSL_CRYPTO_ESS_H
+#pragma once
 
 /*-
  * IssuerSerial ::= SEQUENCE {
@@ -31,7 +31,7 @@ struct ESS_issuer_serial {
  */
 
 struct ESS_cert_id {
-    ASN1_OCTET_STRING *hash;    /* Always SHA-1 digest. */
+    ASN1_OCTET_STRING *hash; /* Always SHA-1 digest. */
     ESS_ISSUER_SERIAL *issuer_serial;
 };
 
@@ -56,7 +56,7 @@ struct ESS_signing_cert {
  */
 
 struct ESS_cert_id_v2_st {
-    X509_ALGOR *hash_alg;       /* Default: SHA-256 */
+    X509_ALGOR *hash_alg; /* Default: SHA-256 */
     ASN1_OCTET_STRING *hash;
     ESS_ISSUER_SERIAL *issuer_serial;
 };
diff --git a/include/crypto/esserr.h b/include/crypto/esserr.h
index 8df2df11eded..7766d05cd92f 100644
--- a/include/crypto/esserr.h
+++ b/include/crypto/esserr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_ESSERR_H
-# define OSSL_CRYPTO_ESSERR_H
-# pragma once
+#define OSSL_CRYPTO_ESSERR_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_ESS_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/evp.h b/include/crypto/evp.h
index 3f1eed3ff632..456a64c943b1 100644
--- a/include/crypto/evp.h
+++ b/include/crypto/evp.h
@@ -8,13 +8,13 @@
  */
 
 #ifndef OSSL_CRYPTO_EVP_H
-# define OSSL_CRYPTO_EVP_H
-# pragma once
+#define OSSL_CRYPTO_EVP_H
+#pragma once
 
-# include <openssl/evp.h>
-# include <openssl/core_dispatch.h>
-# include "internal/refcount.h"
-# include "crypto/ecx.h"
+#include <openssl/evp.h>
+#include <openssl/core_dispatch.h>
+#include "internal/refcount.h"
+#include "crypto/ecx.h"
 
 /*
  * Default PKCS5 PBE KDF salt lengths
@@ -23,18 +23,18 @@
  * The NIST requirement for PBKDF2 is 128 bits so we use this as the
  * default for PBE2 (scrypt and HKDF2)
  */
-# define PKCS5_DEFAULT_PBE1_SALT_LEN     PKCS5_SALT_LEN
-# define PKCS5_DEFAULT_PBE2_SALT_LEN     16
+#define PKCS5_DEFAULT_PBE1_SALT_LEN PKCS5_SALT_LEN
+#define PKCS5_DEFAULT_PBE2_SALT_LEN 16
 /*
  * Don't free up md_ctx->pctx in EVP_MD_CTX_reset, use the reserved flag
  * values in evp.h
  */
-#define EVP_MD_CTX_FLAG_KEEP_PKEY_CTX   0x0400
-#define EVP_MD_CTX_FLAG_FINALISED       0x0800
+#define EVP_MD_CTX_FLAG_KEEP_PKEY_CTX 0x0400
+#define EVP_MD_CTX_FLAG_FINALISED 0x0800
 
-#define evp_pkey_ctx_is_legacy(ctx)                             \
+#define evp_pkey_ctx_is_legacy(ctx) \
     ((ctx)->keymgmt == NULL)
-#define evp_pkey_ctx_is_provided(ctx)                           \
+#define evp_pkey_ctx_is_provided(ctx) \
     (!evp_pkey_ctx_is_legacy(ctx))
 
 struct evp_pkey_ctx_st {
@@ -100,7 +100,7 @@ struct evp_pkey_ctx_st {
     struct {
         /* Distinguishing Identifier, ISO/IEC 15946-3, FIPS 196 */
         char *dist_id_name; /* The name used with EVP_PKEY_CTX_ctrl_str() */
-        void *dist_id;      /* The distinguishing ID itself */
+        void *dist_id; /* The distinguishing ID itself */
         size_t dist_id_len; /* The length of the distinguishing ID */
 
         /* Indicators of what has been set.  Keep them together! */
@@ -130,7 +130,7 @@ struct evp_pkey_ctx_st {
     /* Algorithm specific data */
     void *data;
     /* Indicator if digest_custom needs to be called */
-    unsigned int flag_call_digest_custom:1;
+    unsigned int flag_call_digest_custom : 1;
     /*
      * Used to support taking custody of memory in the case of a provider being
      * used with the deprecated EVP_PKEY_CTX_set_rsa_keygen_pubexp() API. This
@@ -138,58 +138,58 @@ struct evp_pkey_ctx_st {
      * when said deprecated API is excised completely.
      */
     BIGNUM *rsa_pubexp;
-} /* EVP_PKEY_CTX */ ;
+} /* EVP_PKEY_CTX */;
 
-#define EVP_PKEY_FLAG_DYNAMIC   1
+#define EVP_PKEY_FLAG_DYNAMIC 1
 
 struct evp_pkey_method_st {
     int pkey_id;
     int flags;
-    int (*init) (EVP_PKEY_CTX *ctx);
-    int (*copy) (EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src);
-    void (*cleanup) (EVP_PKEY_CTX *ctx);
-    int (*paramgen_init) (EVP_PKEY_CTX *ctx);
-    int (*paramgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
-    int (*keygen_init) (EVP_PKEY_CTX *ctx);
-    int (*keygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
-    int (*sign_init) (EVP_PKEY_CTX *ctx);
-    int (*sign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                 const unsigned char *tbs, size_t tbslen);
-    int (*verify_init) (EVP_PKEY_CTX *ctx);
-    int (*verify) (EVP_PKEY_CTX *ctx,
-                   const unsigned char *sig, size_t siglen,
-                   const unsigned char *tbs, size_t tbslen);
-    int (*verify_recover_init) (EVP_PKEY_CTX *ctx);
-    int (*verify_recover) (EVP_PKEY_CTX *ctx,
-                           unsigned char *rout, size_t *routlen,
-                           const unsigned char *sig, size_t siglen);
-    int (*signctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-    int (*signctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                    EVP_MD_CTX *mctx);
-    int (*verifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-    int (*verifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
-                      EVP_MD_CTX *mctx);
-    int (*encrypt_init) (EVP_PKEY_CTX *ctx);
-    int (*encrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                    const unsigned char *in, size_t inlen);
-    int (*decrypt_init) (EVP_PKEY_CTX *ctx);
-    int (*decrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                    const unsigned char *in, size_t inlen);
-    int (*derive_init) (EVP_PKEY_CTX *ctx);
-    int (*derive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-    int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2);
-    int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value);
-    int (*digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
-                       const unsigned char *tbs, size_t tbslen);
-    int (*digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
-                         size_t siglen, const unsigned char *tbs,
-                         size_t tbslen);
-    int (*check) (EVP_PKEY *pkey);
-    int (*public_check) (EVP_PKEY *pkey);
-    int (*param_check) (EVP_PKEY *pkey);
+    int (*init)(EVP_PKEY_CTX *ctx);
+    int (*copy)(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src);
+    void (*cleanup)(EVP_PKEY_CTX *ctx);
+    int (*paramgen_init)(EVP_PKEY_CTX *ctx);
+    int (*paramgen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
+    int (*keygen_init)(EVP_PKEY_CTX *ctx);
+    int (*keygen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey);
+    int (*sign_init)(EVP_PKEY_CTX *ctx);
+    int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen);
+    int (*verify_init)(EVP_PKEY_CTX *ctx);
+    int (*verify)(EVP_PKEY_CTX *ctx,
+        const unsigned char *sig, size_t siglen,
+        const unsigned char *tbs, size_t tbslen);
+    int (*verify_recover_init)(EVP_PKEY_CTX *ctx);
+    int (*verify_recover)(EVP_PKEY_CTX *ctx,
+        unsigned char *rout, size_t *routlen,
+        const unsigned char *sig, size_t siglen);
+    int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
+    int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+        EVP_MD_CTX *mctx);
+    int (*verifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
+    int (*verifyctx)(EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
+        EVP_MD_CTX *mctx);
+    int (*encrypt_init)(EVP_PKEY_CTX *ctx);
+    int (*encrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+        const unsigned char *in, size_t inlen);
+    int (*decrypt_init)(EVP_PKEY_CTX *ctx);
+    int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+        const unsigned char *in, size_t inlen);
+    int (*derive_init)(EVP_PKEY_CTX *ctx);
+    int (*derive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
+    int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2);
+    int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value);
+    int (*digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen);
+    int (*digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+        size_t siglen, const unsigned char *tbs,
+        size_t tbslen);
+    int (*check)(EVP_PKEY *pkey);
+    int (*public_check)(EVP_PKEY *pkey);
+    int (*param_check)(EVP_PKEY *pkey);
 
-    int (*digest_custom) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
-} /* EVP_PKEY_METHOD */ ;
+    int (*digest_custom)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx);
+} /* EVP_PKEY_METHOD */;
 
 DEFINE_STACK_OF_CONST(EVP_PKEY_METHOD)
 
@@ -249,9 +249,9 @@ struct evp_kdf_st {
     OSSL_FUNC_kdf_set_ctx_params_fn *set_ctx_params;
 };
 
-#define EVP_ORIG_DYNAMIC    0
-#define EVP_ORIG_GLOBAL     1
-#define EVP_ORIG_METH       2
+#define EVP_ORIG_DYNAMIC 0
+#define EVP_ORIG_GLOBAL 1
+#define EVP_ORIG_METH 2
 
 struct evp_md_st {
     /* nid */
@@ -262,15 +262,15 @@ struct evp_md_st {
     int md_size;
     unsigned long flags;
     int origin;
-    int (*init) (EVP_MD_CTX *ctx);
-    int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
-    int (*final) (EVP_MD_CTX *ctx, unsigned char *md);
-    int (*copy) (EVP_MD_CTX *to, const EVP_MD_CTX *from);
-    int (*cleanup) (EVP_MD_CTX *ctx);
+    int (*init)(EVP_MD_CTX *ctx);
+    int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count);
+    int (*final)(EVP_MD_CTX *ctx, unsigned char *md);
+    int (*copy)(EVP_MD_CTX *to, const EVP_MD_CTX *from);
+    int (*cleanup)(EVP_MD_CTX *ctx);
     int block_size;
-    int ctx_size;               /* how big does the ctx->md_data need to be */
+    int ctx_size; /* how big does the ctx->md_data need to be */
     /* control function */
-    int (*md_ctrl) (EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
+    int (*md_ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
 
     /* New structure members */
     /* Above comment to be removed when legacy has gone */
@@ -295,7 +295,7 @@ struct evp_md_st {
     OSSL_FUNC_digest_settable_ctx_params_fn *settable_ctx_params;
     OSSL_FUNC_digest_gettable_ctx_params_fn *gettable_ctx_params;
 
-} /* EVP_MD */ ;
+} /* EVP_MD */;
 
 struct evp_cipher_st {
     int nid;
@@ -311,21 +311,21 @@ struct evp_cipher_st {
     /* How the EVP_CIPHER was created. */
     int origin;
     /* init key */
-    int (*init) (EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                 const unsigned char *iv, int enc);
+    int (*init)(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+        const unsigned char *iv, int enc);
     /* encrypt/decrypt data */
-    int (*do_cipher) (EVP_CIPHER_CTX *ctx, unsigned char *out,
-                      const unsigned char *in, size_t inl);
+    int (*do_cipher)(EVP_CIPHER_CTX *ctx, unsigned char *out,
+        const unsigned char *in, size_t inl);
     /* cleanup ctx */
-    int (*cleanup) (EVP_CIPHER_CTX *);
+    int (*cleanup)(EVP_CIPHER_CTX *);
     /* how big ctx->cipher_data needs to be */
     int ctx_size;
     /* Populate a ASN1_TYPE with parameters */
-    int (*set_asn1_parameters) (EVP_CIPHER_CTX *, ASN1_TYPE *);
+    int (*set_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *);
     /* Get parameters from a ASN1_TYPE */
-    int (*get_asn1_parameters) (EVP_CIPHER_CTX *, ASN1_TYPE *);
+    int (*get_asn1_parameters)(EVP_CIPHER_CTX *, ASN1_TYPE *);
     /* Miscellaneous operations */
-    int (*ctrl) (EVP_CIPHER_CTX *, int type, int arg, void *ptr);
+    int (*ctrl)(EVP_CIPHER_CTX *, int type, int arg, void *ptr);
     /* Application data */
     void *app_data;
 
@@ -363,141 +363,142 @@ struct evp_cipher_st {
 /* Wrapper functions for each cipher mode */
 
 #define EVP_C_DATA(kstruct, ctx) \
-        ((kstruct *)EVP_CIPHER_CTX_get_cipher_data(ctx))
+    ((kstruct *)EVP_CIPHER_CTX_get_cipher_data(ctx))
 
-#define BLOCK_CIPHER_ecb_loop() \
-        size_t i, bl; \
-        bl = EVP_CIPHER_CTX_get0_cipher(ctx)->block_size;    \
-        if (inl < bl) return 1;\
-        inl -= bl; \
-        for (i=0; i <= inl; i+=bl)
+#define BLOCK_CIPHER_ecb_loop()                       \
+    size_t i, bl;                                     \
+    bl = EVP_CIPHER_CTX_get0_cipher(ctx)->block_size; \
+    if (inl < bl)                                     \
+        return 1;                                     \
+    inl -= bl;                                        \
+    for (i = 0; i <= inl; i += bl)
 
-#define BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched) \
-static int cname##_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
-{\
-        BLOCK_CIPHER_ecb_loop() \
-            cprefix##_ecb_encrypt(in + i, out + i, &EVP_C_DATA(kstruct,ctx)->ksched, EVP_CIPHER_CTX_is_encrypting(ctx)); \
-        return 1;\
-}
+#define BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched)                                                            \
+    static int cname##_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)           \
+    {                                                                                                                     \
+        BLOCK_CIPHER_ecb_loop()                                                                                           \
+            cprefix##_ecb_encrypt(in + i, out + i, &EVP_C_DATA(kstruct, ctx)->ksched, EVP_CIPHER_CTX_is_encrypting(ctx)); \
+        return 1;                                                                                                         \
+    }
 
 #define EVP_MAXCHUNK ((size_t)1 << 30)
 
-#define BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched) \
-    static int cname##_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
-{\
-        while(inl>=EVP_MAXCHUNK) {\
-            int num = EVP_CIPHER_CTX_get_num(ctx);\
-            cprefix##_ofb##cbits##_encrypt(in, out, (long)EVP_MAXCHUNK, &EVP_C_DATA(kstruct,ctx)->ksched, ctx->iv, &num); \
-            EVP_CIPHER_CTX_set_num(ctx, num);\
-            inl-=EVP_MAXCHUNK;\
-            in +=EVP_MAXCHUNK;\
-            out+=EVP_MAXCHUNK;\
-        }\
-        if (inl) {\
-            int num = EVP_CIPHER_CTX_get_num(ctx);\
-            cprefix##_ofb##cbits##_encrypt(in, out, (long)inl, &EVP_C_DATA(kstruct,ctx)->ksched, ctx->iv, &num); \
-            EVP_CIPHER_CTX_set_num(ctx, num);\
-        }\
-        return 1;\
-}
+#define BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched)                                                      \
+    static int cname##_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)            \
+    {                                                                                                                      \
+        while (inl >= EVP_MAXCHUNK) {                                                                                      \
+            int num = EVP_CIPHER_CTX_get_num(ctx);                                                                         \
+            cprefix##_ofb##cbits##_encrypt(in, out, (long)EVP_MAXCHUNK, &EVP_C_DATA(kstruct, ctx)->ksched, ctx->iv, &num); \
+            EVP_CIPHER_CTX_set_num(ctx, num);                                                                              \
+            inl -= EVP_MAXCHUNK;                                                                                           \
+            in += EVP_MAXCHUNK;                                                                                            \
+            out += EVP_MAXCHUNK;                                                                                           \
+        }                                                                                                                  \
+        if (inl) {                                                                                                         \
+            int num = EVP_CIPHER_CTX_get_num(ctx);                                                                         \
+            cprefix##_ofb##cbits##_encrypt(in, out, (long)inl, &EVP_C_DATA(kstruct, ctx)->ksched, ctx->iv, &num);          \
+            EVP_CIPHER_CTX_set_num(ctx, num);                                                                              \
+        }                                                                                                                  \
+        return 1;                                                                                                          \
+    }
 
-#define BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \
-static int cname##_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
-{\
-        while(inl>=EVP_MAXCHUNK) {\
-            cprefix##_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, &EVP_C_DATA(kstruct,ctx)->ksched, ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));\
-            inl-=EVP_MAXCHUNK;\
-            in +=EVP_MAXCHUNK;\
-            out+=EVP_MAXCHUNK;\
-        }\
-        if (inl)\
-            cprefix##_cbc_encrypt(in, out, (long)inl, &EVP_C_DATA(kstruct,ctx)->ksched, ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));\
-        return 1;\
-}
+#define BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched)                                                                                 \
+    static int cname##_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)                                \
+    {                                                                                                                                          \
+        while (inl >= EVP_MAXCHUNK) {                                                                                                          \
+            cprefix##_cbc_encrypt(in, out, (long)EVP_MAXCHUNK, &EVP_C_DATA(kstruct, ctx)->ksched, ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx)); \
+            inl -= EVP_MAXCHUNK;                                                                                                               \
+            in += EVP_MAXCHUNK;                                                                                                                \
+            out += EVP_MAXCHUNK;                                                                                                               \
+        }                                                                                                                                      \
+        if (inl)                                                                                                                               \
+            cprefix##_cbc_encrypt(in, out, (long)inl, &EVP_C_DATA(kstruct, ctx)->ksched, ctx->iv, EVP_CIPHER_CTX_is_encrypting(ctx));          \
+        return 1;                                                                                                                              \
+    }
 
-#define BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched)  \
-static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl) \
-{\
-    size_t chunk = EVP_MAXCHUNK;\
-    if (cbits == 1)  chunk >>= 3;\
-    if (inl < chunk) chunk = inl;\
-    while (inl && inl >= chunk) {\
-        int num = EVP_CIPHER_CTX_get_num(ctx);\
-        cprefix##_cfb##cbits##_encrypt(in, out, (long) \
-            ((cbits == 1) \
-                && !EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS) \
-                ? chunk*8 : chunk), \
-            &EVP_C_DATA(kstruct, ctx)->ksched, ctx->iv,\
-            &num, EVP_CIPHER_CTX_is_encrypting(ctx));\
-        EVP_CIPHER_CTX_set_num(ctx, num);\
-        inl -= chunk;\
-        in += chunk;\
-        out += chunk;\
-        if (inl < chunk) chunk = inl;\
-    }\
-    return 1;\
-}
+#define BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched)                                                                                       \
+    static int cname##_cfb##cbits##_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, const unsigned char *in, size_t inl)                                    \
+    {                                                                                                                                                       \
+        size_t chunk = EVP_MAXCHUNK;                                                                                                                        \
+        if (cbits == 1)                                                                                                                                     \
+            chunk >>= 3;                                                                                                                                    \
+        if (inl < chunk)                                                                                                                                    \
+            chunk = inl;                                                                                                                                    \
+        while (inl && inl >= chunk) {                                                                                                                       \
+            int num = EVP_CIPHER_CTX_get_num(ctx);                                                                                                          \
+            cprefix##_cfb##cbits##_encrypt(in, out, (long)((cbits == 1) && !EVP_CIPHER_CTX_test_flags(ctx, EVP_CIPH_FLAG_LENGTH_BITS) ? chunk * 8 : chunk), \
+                &EVP_C_DATA(kstruct, ctx)->ksched, ctx->iv,                                                                                                 \
+                &num, EVP_CIPHER_CTX_is_encrypting(ctx));                                                                                                   \
+            EVP_CIPHER_CTX_set_num(ctx, num);                                                                                                               \
+            inl -= chunk;                                                                                                                                   \
+            in += chunk;                                                                                                                                    \
+            out += chunk;                                                                                                                                   \
+            if (inl < chunk)                                                                                                                                \
+                chunk = inl;                                                                                                                                \
+        }                                                                                                                                                   \
+        return 1;                                                                                                                                           \
+    }
 
 #define BLOCK_CIPHER_all_funcs(cname, cprefix, cbits, kstruct, ksched) \
-        BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched) \
-        BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched) \
-        BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched) \
-        BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched)
+    BLOCK_CIPHER_func_cbc(cname, cprefix, kstruct, ksched)             \
+        BLOCK_CIPHER_func_cfb(cname, cprefix, cbits, kstruct, ksched)  \
+            BLOCK_CIPHER_func_ecb(cname, cprefix, kstruct, ksched)     \
+                BLOCK_CIPHER_func_ofb(cname, cprefix, cbits, kstruct, ksched)
 
 #define BLOCK_CIPHER_def1(cname, nmode, mode, MODE, kstruct, nid, block_size, \
-                          key_len, iv_len, flags, init_key, cleanup, \
-                          set_asn1, get_asn1, ctrl) \
-static const EVP_CIPHER cname##_##mode = { \
-        nid##_##nmode, block_size, key_len, iv_len, \
-        flags | EVP_CIPH_##MODE##_MODE, \
-        EVP_ORIG_GLOBAL, \
-        init_key, \
-        cname##_##mode##_cipher, \
-        cleanup, \
-        sizeof(kstruct), \
-        set_asn1, get_asn1,\
-        ctrl, \
-        NULL \
-}; \
-const EVP_CIPHER *EVP_##cname##_##mode(void) { return &cname##_##mode; }
+    key_len, iv_len, flags, init_key, cleanup,                                \
+    set_asn1, get_asn1, ctrl)                                                 \
+    static const EVP_CIPHER cname##_##mode = {                                \
+        nid##_##nmode, block_size, key_len, iv_len,                           \
+        flags | EVP_CIPH_##MODE##_MODE,                                       \
+        EVP_ORIG_GLOBAL,                                                      \
+        init_key,                                                             \
+        cname##_##mode##_cipher,                                              \
+        cleanup,                                                              \
+        sizeof(kstruct),                                                      \
+        set_asn1, get_asn1,                                                   \
+        ctrl,                                                                 \
+        NULL                                                                  \
+    };                                                                        \
+    const EVP_CIPHER *EVP_##cname##_##mode(void) { return &cname##_##mode; }
 
-#define BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, \
-                             iv_len, flags, init_key, cleanup, set_asn1, \
-                             get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \
-                  iv_len, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
+#define BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len,         \
+    iv_len, flags, init_key, cleanup, set_asn1,                                \
+    get_asn1, ctrl)                                                            \
+    BLOCK_CIPHER_def1(cname, cbc, cbc, CBC, kstruct, nid, block_size, key_len, \
+        iv_len, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
 
-#define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, \
-                             iv_len, cbits, flags, init_key, cleanup, \
-                             set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
-                  key_len, iv_len, flags, init_key, cleanup, set_asn1, \
-                  get_asn1, ctrl)
+#define BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len,                 \
+    iv_len, cbits, flags, init_key, cleanup,                               \
+    set_asn1, get_asn1, ctrl)                                              \
+    BLOCK_CIPHER_def1(cname, cfb##cbits, cfb##cbits, CFB, kstruct, nid, 1, \
+        key_len, iv_len, flags, init_key, cleanup, set_asn1,               \
+        get_asn1, ctrl)
 
-#define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, \
-                             iv_len, cbits, flags, init_key, cleanup, \
-                             set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, 1, \
-                  key_len, iv_len, flags, init_key, cleanup, set_asn1, \
-                  get_asn1, ctrl)
+#define BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len,          \
+    iv_len, cbits, flags, init_key, cleanup,                        \
+    set_asn1, get_asn1, ctrl)                                       \
+    BLOCK_CIPHER_def1(cname, ofb##cbits, ofb, OFB, kstruct, nid, 1, \
+        key_len, iv_len, flags, init_key, cleanup, set_asn1,        \
+        get_asn1, ctrl)
 
-#define BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, \
-                             flags, init_key, cleanup, set_asn1, \
-                             get_asn1, ctrl) \
-BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \
-                  0, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
+#define BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len,         \
+    flags, init_key, cleanup, set_asn1,                                        \
+    get_asn1, ctrl)                                                            \
+    BLOCK_CIPHER_def1(cname, ecb, ecb, ECB, kstruct, nid, block_size, key_len, \
+        0, flags, init_key, cleanup, set_asn1, get_asn1, ctrl)
 
-#define BLOCK_CIPHER_defs(cname, kstruct, \
-                          nid, block_size, key_len, iv_len, cbits, flags, \
-                          init_key, cleanup, set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags, \
-                     init_key, cleanup, set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, iv_len, cbits, \
-                     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, iv_len, cbits, \
-                     flags, init_key, cleanup, set_asn1, get_asn1, ctrl) \
-BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, flags, \
-                     init_key, cleanup, set_asn1, get_asn1, ctrl)
+#define BLOCK_CIPHER_defs(cname, kstruct,                                             \
+    nid, block_size, key_len, iv_len, cbits, flags,                                   \
+    init_key, cleanup, set_asn1, get_asn1, ctrl)                                      \
+    BLOCK_CIPHER_def_cbc(cname, kstruct, nid, block_size, key_len, iv_len, flags,     \
+        init_key, cleanup, set_asn1, get_asn1, ctrl)                                  \
+        BLOCK_CIPHER_def_cfb(cname, kstruct, nid, key_len, iv_len, cbits,             \
+            flags, init_key, cleanup, set_asn1, get_asn1, ctrl)                       \
+            BLOCK_CIPHER_def_ofb(cname, kstruct, nid, key_len, iv_len, cbits,         \
+                flags, init_key, cleanup, set_asn1, get_asn1, ctrl)                   \
+                BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, flags, \
+                    init_key, cleanup, set_asn1, get_asn1, ctrl)
 
 /*-
 #define BLOCK_CIPHER_defs(cname, kstruct, \
@@ -561,21 +562,21 @@ static const EVP_CIPHER cname##_ecb = {\
 const EVP_CIPHER *EVP_##cname##_ecb(void) { return &cname##_ecb; }
 */
 
-#define IMPLEMENT_BLOCK_CIPHER(cname, ksched, cprefix, kstruct, nid, \
-                               block_size, key_len, iv_len, cbits, \
-                               flags, init_key, \
-                               cleanup, set_asn1, get_asn1, ctrl) \
-        BLOCK_CIPHER_all_funcs(cname, cprefix, cbits, kstruct, ksched) \
+#define IMPLEMENT_BLOCK_CIPHER(cname, ksched, cprefix, kstruct, nid,        \
+    block_size, key_len, iv_len, cbits,                                     \
+    flags, init_key,                                                        \
+    cleanup, set_asn1, get_asn1, ctrl)                                      \
+    BLOCK_CIPHER_all_funcs(cname, cprefix, cbits, kstruct, ksched)          \
         BLOCK_CIPHER_defs(cname, kstruct, nid, block_size, key_len, iv_len, \
-                          cbits, flags, init_key, cleanup, set_asn1, \
-                          get_asn1, ctrl)
+            cbits, flags, init_key, cleanup, set_asn1,                      \
+            get_asn1, ctrl)
 
-#define IMPLEMENT_CFBR(cipher,cprefix,kstruct,ksched,keysize,cbits,iv_len,fl) \
-        BLOCK_CIPHER_func_cfb(cipher##_##keysize,cprefix,cbits,kstruct,ksched) \
-        BLOCK_CIPHER_def_cfb(cipher##_##keysize,kstruct, \
-                             NID_##cipher##_##keysize, keysize/8, iv_len, cbits, \
-                             (fl)|EVP_CIPH_FLAG_DEFAULT_ASN1, \
-                             cipher##_init_key, NULL, NULL, NULL, NULL)
+#define IMPLEMENT_CFBR(cipher, cprefix, kstruct, ksched, keysize, cbits, iv_len, fl) \
+    BLOCK_CIPHER_func_cfb(cipher##_##keysize, cprefix, cbits, kstruct, ksched)       \
+        BLOCK_CIPHER_def_cfb(cipher##_##keysize, kstruct,                            \
+            NID_##cipher##_##keysize, keysize / 8, iv_len, cbits,                    \
+            (fl) | EVP_CIPH_FLAG_DEFAULT_ASN1,                                       \
+            cipher##_init_key, NULL, NULL, NULL, NULL)
 
 typedef struct {
     unsigned char iv[EVP_MAX_IV_LENGTH];
@@ -584,10 +585,10 @@ typedef struct {
 } evp_cipher_aead_asn1_params;
 
 int evp_cipher_param_to_asn1_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                evp_cipher_aead_asn1_params *params);
+    evp_cipher_aead_asn1_params *params);
 
 int evp_cipher_asn1_to_param_ex(EVP_CIPHER_CTX *c, ASN1_TYPE *type,
-                                evp_cipher_aead_asn1_params *params);
+    evp_cipher_aead_asn1_params *params);
 
 /*
  * To support transparent execution of operation in backends other
@@ -632,37 +633,37 @@ DEFINE_STACK_OF(OP_CACHE_ELEM)
  *
  *     keymgmt != NULL
  */
-#define evp_pkey_is_blank(pk)                                   \
+#define evp_pkey_is_blank(pk) \
     ((pk)->type == EVP_PKEY_NONE && (pk)->keymgmt == NULL)
-#define evp_pkey_is_typed(pk)                                   \
+#define evp_pkey_is_typed(pk) \
     ((pk)->type != EVP_PKEY_NONE || (pk)->keymgmt != NULL)
 #ifndef FIPS_MODULE
-# define evp_pkey_is_assigned(pk)                               \
+#define evp_pkey_is_assigned(pk) \
     ((pk)->pkey.ptr != NULL || (pk)->keydata != NULL)
 #else
-# define evp_pkey_is_assigned(pk)                               \
+#define evp_pkey_is_assigned(pk) \
     ((pk)->keydata != NULL)
 #endif
-#define evp_pkey_is_legacy(pk)                                  \
+#define evp_pkey_is_legacy(pk) \
     ((pk)->type != EVP_PKEY_NONE && (pk)->keymgmt == NULL)
-#define evp_pkey_is_provided(pk)                                \
+#define evp_pkey_is_provided(pk) \
     ((pk)->keymgmt != NULL)
 
 union legacy_pkey_st {
     void *ptr;
-    struct rsa_st *rsa;     /* RSA */
-#  ifndef OPENSSL_NO_DSA
-    struct dsa_st *dsa;     /* DSA */
-#  endif
-#  ifndef OPENSSL_NO_DH
-    struct dh_st *dh;       /* DH */
-#  endif
-#  ifndef OPENSSL_NO_EC
-    struct ec_key_st *ec;   /* ECC */
-#   ifndef OPENSSL_NO_ECX
-    ECX_KEY *ecx;           /* X25519, X448, Ed25519, Ed448 */
-#   endif
-#  endif
+    struct rsa_st *rsa; /* RSA */
+#ifndef OPENSSL_NO_DSA
+    struct dsa_st *dsa; /* DSA */
+#endif
+#ifndef OPENSSL_NO_DH
+    struct dh_st *dh; /* DH */
+#endif
+#ifndef OPENSSL_NO_EC
+    struct ec_key_st *ec; /* ECC */
+#ifndef OPENSSL_NO_ECX
+    ECX_KEY *ecx; /* X25519, X448, Ed25519, Ed448 */
+#endif
+#endif
 };
 
 struct evp_pkey_st {
@@ -670,7 +671,7 @@ struct evp_pkey_st {
     int type;
     int save_type;
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
     /*
      * Legacy key "origin" is composed of a pointer to an EVP_PKEY_ASN1_METHOD,
      * a pointer to a low level key and possibly a pointer to an engine.
@@ -684,7 +685,7 @@ struct evp_pkey_st {
 
     /* Union to store the reference to a non-origin legacy key */
     union legacy_pkey_st legacy_cache_pkey;
-# endif
+#endif
 
     /* == Common attributes == */
     CRYPTO_REF_COUNT references;
@@ -692,7 +693,7 @@ struct evp_pkey_st {
 #ifndef FIPS_MODULE
     STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
     int save_parameters;
-    unsigned int foreign:1; /* the low-level key is using an engine or an app-method */
+    unsigned int foreign : 1; /* the low-level key is using an engine or an app-method */
     CRYPTO_EX_DATA ex_data;
 #endif
 
@@ -736,22 +737,22 @@ struct evp_pkey_st {
 
 /* The EVP_PKEY_OP_TYPE_ macros are found in include/openssl/evp.h */
 
-# define EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx) \
+#define EVP_PKEY_CTX_IS_SIGNATURE_OP(ctx) \
     (((ctx)->operation & EVP_PKEY_OP_TYPE_SIG) != 0)
 
-# define EVP_PKEY_CTX_IS_DERIVE_OP(ctx) \
+#define EVP_PKEY_CTX_IS_DERIVE_OP(ctx) \
     (((ctx)->operation & EVP_PKEY_OP_TYPE_DERIVE) != 0)
 
-# define EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx) \
+#define EVP_PKEY_CTX_IS_ASYM_CIPHER_OP(ctx) \
     (((ctx)->operation & EVP_PKEY_OP_TYPE_CRYPT) != 0)
 
-# define EVP_PKEY_CTX_IS_GEN_OP(ctx) \
+#define EVP_PKEY_CTX_IS_GEN_OP(ctx) \
     (((ctx)->operation & EVP_PKEY_OP_TYPE_GEN) != 0)
 
-# define EVP_PKEY_CTX_IS_FROMDATA_OP(ctx) \
+#define EVP_PKEY_CTX_IS_FROMDATA_OP(ctx) \
     (((ctx)->operation & EVP_PKEY_OP_TYPE_DATA) != 0)
 
-# define EVP_PKEY_CTX_IS_KEM_OP(ctx) \
+#define EVP_PKEY_CTX_IS_KEM_OP(ctx) \
     (((ctx)->operation & EVP_PKEY_OP_TYPE_KEM) != 0)
 
 struct evp_skey_st {
@@ -768,14 +769,14 @@ void openssl_add_all_digests_int(void);
 void evp_cleanup_int(void);
 void evp_app_cleanup_int(void);
 void *evp_pkey_export_to_provider(EVP_PKEY *pk, OSSL_LIB_CTX *libctx,
-                                  EVP_KEYMGMT **keymgmt,
-                                  const char *propquery);
+    EVP_KEYMGMT **keymgmt,
+    const char *propquery);
 #ifndef FIPS_MODULE
 int evp_pkey_copy_downgraded(EVP_PKEY **dest, const EVP_PKEY *src);
 void *evp_pkey_get_legacy(EVP_PKEY *pk);
 void evp_pkey_free_legacy(EVP_PKEY *x);
 EVP_PKEY *evp_pkcs82pkey_legacy(const PKCS8_PRIV_KEY_INFO *p8inf,
-                                OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 #endif
 
 /*
@@ -793,32 +794,32 @@ struct evp_keymgmt_util_try_import_data_st {
 };
 int evp_keymgmt_util_try_import(const OSSL_PARAM params[], void *arg);
 int evp_keymgmt_util_assign_pkey(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt,
-                                 void *keydata);
+    void *keydata);
 EVP_PKEY *evp_keymgmt_util_make_pkey(EVP_KEYMGMT *keymgmt, void *keydata);
 
 int evp_keymgmt_util_export(const EVP_PKEY *pk, int selection,
-                            OSSL_CALLBACK *export_cb, void *export_cbarg);
+    OSSL_CALLBACK *export_cb, void *export_cbarg);
 void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
-                                          int selection);
+    int selection);
 OP_CACHE_ELEM *evp_keymgmt_util_find_operation_cache(EVP_PKEY *pk,
-                                                     EVP_KEYMGMT *keymgmt,
-                                                     int selection);
+    EVP_KEYMGMT *keymgmt,
+    int selection);
 int evp_keymgmt_util_clear_operation_cache(EVP_PKEY *pk);
 int evp_keymgmt_util_cache_keydata(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt,
-                                   void *keydata, int selection);
+    void *keydata, int selection);
 void evp_keymgmt_util_cache_keyinfo(EVP_PKEY *pk);
 void *evp_keymgmt_util_fromdata(EVP_PKEY *target, EVP_KEYMGMT *keymgmt,
-                                int selection, const OSSL_PARAM params[]);
+    int selection, const OSSL_PARAM params[]);
 int evp_keymgmt_util_has(EVP_PKEY *pk, int selection);
 int evp_keymgmt_util_match(EVP_PKEY *pk1, EVP_PKEY *pk2, int selection);
 int evp_keymgmt_util_copy(EVP_PKEY *to, EVP_PKEY *from, int selection);
 void *evp_keymgmt_util_gen(EVP_PKEY *target, EVP_KEYMGMT *keymgmt,
-                           void *genctx, OSSL_CALLBACK *cb, void *cbarg);
+    void *genctx, OSSL_CALLBACK *cb, void *cbarg);
 int evp_keymgmt_util_get_deflt_digest_name(EVP_KEYMGMT *keymgmt,
-                                           void *keydata,
-                                           char *mdname, size_t mdname_sz);
+    void *keydata,
+    char *mdname, size_t mdname_sz);
 const char *evp_keymgmt_util_query_operation_name(EVP_KEYMGMT *keymgmt,
-                                                  int op_id);
+    int op_id);
 
 /*
  * KEYMGMT provider interface functions
@@ -826,45 +827,45 @@ const char *evp_keymgmt_util_query_operation_name(EVP_KEYMGMT *keymgmt,
 void *evp_keymgmt_newdata(const EVP_KEYMGMT *keymgmt);
 void evp_keymgmt_freedata(const EVP_KEYMGMT *keymgmt, void *keyddata);
 int evp_keymgmt_get_params(const EVP_KEYMGMT *keymgmt,
-                           void *keydata, OSSL_PARAM params[]);
+    void *keydata, OSSL_PARAM params[]);
 int evp_keymgmt_set_params(const EVP_KEYMGMT *keymgmt,
-                           void *keydata, const OSSL_PARAM params[]);
+    void *keydata, const OSSL_PARAM params[]);
 void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection,
-                           const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx,
-                                 void *templ);
+    void *templ);
 int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx,
-                               const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int evp_keymgmt_gen_get_params(const EVP_KEYMGMT *keymgmt,
-                               void *genctx, OSSL_PARAM params[]);
+    void *genctx, OSSL_PARAM params[]);
 void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx,
-                      OSSL_CALLBACK *cb, void *cbarg);
+    OSSL_CALLBACK *cb, void *cbarg);
 void evp_keymgmt_gen_cleanup(const EVP_KEYMGMT *keymgmt, void *genctx);
 
 int evp_keymgmt_has_load(const EVP_KEYMGMT *keymgmt);
 void *evp_keymgmt_load(const EVP_KEYMGMT *keymgmt,
-                       const void *objref, size_t objref_sz);
+    const void *objref, size_t objref_sz);
 
 int evp_keymgmt_has(const EVP_KEYMGMT *keymgmt, void *keyddata, int selection);
 int evp_keymgmt_validate(const EVP_KEYMGMT *keymgmt, void *keydata,
-                         int selection, int checktype);
+    int selection, int checktype);
 int evp_keymgmt_match(const EVP_KEYMGMT *keymgmt,
-                      const void *keydata1, const void *keydata2,
-                      int selection);
+    const void *keydata1, const void *keydata2,
+    int selection);
 
 int evp_keymgmt_import(const EVP_KEYMGMT *keymgmt, void *keydata,
-                       int selection, const OSSL_PARAM params[]);
+    int selection, const OSSL_PARAM params[]);
 const OSSL_PARAM *evp_keymgmt_import_types(const EVP_KEYMGMT *keymgmt,
-                                           int selection);
+    int selection);
 int evp_keymgmt_export(const EVP_KEYMGMT *keymgmt, void *keydata,
-                       int selection, OSSL_CALLBACK *param_cb, void *cbarg);
+    int selection, OSSL_CALLBACK *param_cb, void *cbarg);
 const OSSL_PARAM *evp_keymgmt_export_types(const EVP_KEYMGMT *keymgmt,
-                                           int selection);
+    int selection);
 void *evp_keymgmt_dup(const EVP_KEYMGMT *keymgmt,
-                      const void *keydata_from, int selection);
+    const void *keydata_from, int selection);
 EVP_KEYMGMT *evp_keymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
-                                         const char *name,
-                                         const char *properties);
+    const char *name,
+    const char *properties);
 
 /*
  * SKEYMGMT provider interface functions
@@ -872,39 +873,39 @@ EVP_KEYMGMT *evp_keymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
 void evp_skeymgmt_freedata(const EVP_SKEYMGMT *keymgmt, void *keyddata);
 void *evp_skeymgmt_import(const EVP_SKEYMGMT *skeymgmt, int selection, const OSSL_PARAM params[]);
 int evp_skeymgmt_export(const EVP_SKEYMGMT *skeymgmt, void *keydata,
-                        int selection, OSSL_CALLBACK *param_cb, void *cbarg);
+    int selection, OSSL_CALLBACK *param_cb, void *cbarg);
 void *evp_skeymgmt_generate(const EVP_SKEYMGMT *skeymgmt, const OSSL_PARAM params[]);
 EVP_SKEYMGMT *evp_skeymgmt_fetch_from_prov(OSSL_PROVIDER *prov,
-                                           const char *name,
-                                           const char *properties);
+    const char *name,
+    const char *properties);
 
 /* Pulling defines out of C source files */
 
-# define EVP_RC4_KEY_SIZE 16
-# ifndef TLS1_1_VERSION
-#  define TLS1_1_VERSION   0x0302
-# endif
+#define EVP_RC4_KEY_SIZE 16
+#ifndef TLS1_1_VERSION
+#define TLS1_1_VERSION 0x0302
+#endif
 
 void evp_encode_ctx_set_flags(EVP_ENCODE_CTX *ctx, unsigned int flags);
 
 /* EVP_ENCODE_CTX flags */
 /* Don't generate new lines when encoding */
-#define EVP_ENCODE_CTX_NO_NEWLINES          1
+#define EVP_ENCODE_CTX_NO_NEWLINES 1
 /* Use the SRP base64 alphabet instead of the standard one */
-#define EVP_ENCODE_CTX_USE_SRP_ALPHABET     2
+#define EVP_ENCODE_CTX_USE_SRP_ALPHABET 2
 
 const EVP_CIPHER *evp_get_cipherbyname_ex(OSSL_LIB_CTX *libctx,
-                                          const char *name);
+    const char *name);
 const EVP_MD *evp_get_digestbyname_ex(OSSL_LIB_CTX *libctx,
-                                      const char *name);
+    const char *name);
 
 int ossl_pkcs5_pbkdf2_hmac_ex(const char *pass, int passlen,
-                              const unsigned char *salt, int saltlen, int iter,
-                              const EVP_MD *digest, int keylen,
-                              unsigned char *out,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    const unsigned char *salt, int saltlen, int iter,
+    const EVP_MD *digest, int keylen,
+    unsigned char *out,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 /*
  * Internal helpers for stricter EVP_PKEY_CTX_{set,get}_params().
  *
@@ -921,20 +922,20 @@ int evp_pkey_ctx_set_params_strict(EVP_PKEY_CTX *ctx, OSSL_PARAM *params);
 int evp_pkey_ctx_get_params_strict(EVP_PKEY_CTX *ctx, OSSL_PARAM *params);
 
 EVP_MD_CTX *evp_md_ctx_new_ex(EVP_PKEY *pkey, const ASN1_OCTET_STRING *id,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int evp_pkey_name2type(const char *name);
 const char *evp_pkey_type2name(int type);
 
 int evp_pkey_ctx_use_cached_data(EVP_PKEY_CTX *ctx);
-# endif /* !defined(FIPS_MODULE) */
+#endif /* !defined(FIPS_MODULE) */
 
 int evp_method_store_cache_flush(OSSL_LIB_CTX *libctx);
 int evp_method_store_remove_all_provided(const OSSL_PROVIDER *prov);
 
 int evp_default_properties_enable_fips_int(OSSL_LIB_CTX *libctx, int enable,
-                                           int loadconfig);
+    int loadconfig);
 int evp_set_default_properties_int(OSSL_LIB_CTX *libctx, const char *propq,
-                                   int loadconfig, int mirrored);
+    int loadconfig, int mirrored);
 char *evp_get_global_properties_str(OSSL_LIB_CTX *libctx, int loadconfig);
 
 void evp_md_ctx_clear_digest(EVP_MD_CTX *ctx, int force, int keep_digest);
@@ -942,17 +943,17 @@ void evp_md_ctx_clear_digest(EVP_MD_CTX *ctx, int force, int keep_digest);
 int evp_md_ctx_free_algctx(EVP_MD_CTX *ctx);
 
 /* Three possible states: */
-# define EVP_PKEY_STATE_UNKNOWN         0
-# define EVP_PKEY_STATE_LEGACY          1
-# define EVP_PKEY_STATE_PROVIDER        2
+#define EVP_PKEY_STATE_UNKNOWN 0
+#define EVP_PKEY_STATE_LEGACY 1
+#define EVP_PKEY_STATE_PROVIDER 2
 int evp_pkey_ctx_state(const EVP_PKEY_CTX *ctx);
 
 /* These two must ONLY be called for provider side operations */
 int evp_pkey_ctx_ctrl_to_param(EVP_PKEY_CTX *ctx,
-                               int keytype, int optype,
-                               int cmd, int p1, void *p2);
+    int keytype, int optype,
+    int cmd, int p1, void *p2);
 int evp_pkey_ctx_ctrl_str_to_param(EVP_PKEY_CTX *ctx,
-                                   const char *name, const char *value);
+    const char *name, const char *value);
 
 /* These two must ONLY be called for legacy operations */
 int evp_pkey_ctx_set_params_to_ctrl(EVP_PKEY_CTX *ctx, const OSSL_PARAM *params);
@@ -962,11 +963,11 @@ int evp_pkey_ctx_get_params_to_ctrl(EVP_PKEY_CTX *ctx, OSSL_PARAM *params);
 int evp_pkey_get_params_to_ctrl(const EVP_PKEY *pkey, OSSL_PARAM *params);
 
 /* Same as the public get0 functions but are not const */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 DH *evp_pkey_get0_DH_int(const EVP_PKEY *pkey);
 EC_KEY *evp_pkey_get0_EC_KEY_int(const EVP_PKEY *pkey);
 RSA *evp_pkey_get0_RSA_int(const EVP_PKEY *pkey);
-# endif
+#endif
 
 /* Get internal identification number routines */
 int evp_asym_cipher_get_number(const EVP_ASYM_CIPHER *cipher);
@@ -981,17 +982,17 @@ int evp_md_get_number(const EVP_MD *md);
 int evp_rand_get_number(const EVP_RAND *rand);
 int evp_rand_can_seed(EVP_RAND_CTX *ctx);
 size_t evp_rand_get_seed(EVP_RAND_CTX *ctx,
-                         unsigned char **buffer,
-                         int entropy, size_t min_len, size_t max_len,
-                         int prediction_resistance,
-                         const unsigned char *adin, size_t adin_len);
+    unsigned char **buffer,
+    int entropy, size_t min_len, size_t max_len,
+    int prediction_resistance,
+    const unsigned char *adin, size_t adin_len);
 void evp_rand_clear_seed(EVP_RAND_CTX *ctx,
-                         unsigned char *buffer, size_t b_len);
+    unsigned char *buffer, size_t b_len);
 int evp_signature_get_number(const EVP_SIGNATURE *signature);
 
 int evp_pkey_decrypt_alloc(EVP_PKEY_CTX *ctx, unsigned char **outp,
-                           size_t *outlenp, size_t expected_outlen,
-                           const unsigned char *in, size_t inlen);
+    size_t *outlenp, size_t expected_outlen,
+    const unsigned char *in, size_t inlen);
 
 int ossl_md2hmacnid(int mdnid);
 int ossl_hmac2mdnid(int hmac_nid);
diff --git a/include/crypto/evperr.h b/include/crypto/evperr.h
index 66160bb10515..1a91b62fce56 100644
--- a/include/crypto/evperr.h
+++ b/include/crypto/evperr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_EVPERR_H
-# define OSSL_CRYPTO_EVPERR_H
-# pragma once
+#define OSSL_CRYPTO_EVPERR_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_EVP_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/httperr.h b/include/crypto/httperr.h
index 827d61a235d6..f5550aa167fa 100644
--- a/include/crypto/httperr.h
+++ b/include/crypto/httperr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_HTTPERR_H
-# define OSSL_CRYPTO_HTTPERR_H
-# pragma once
+#define OSSL_CRYPTO_HTTPERR_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
 
-# ifndef OPENSSL_NO_HTTP
+#ifndef OPENSSL_NO_HTTP
 
 int ossl_err_load_HTTP_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/lhash.h b/include/crypto/lhash.h
index 0f64869f54ba..73af3cead3a5 100644
--- a/include/crypto/lhash.h
+++ b/include/crypto/lhash.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_CRYPTO_LHASH_H
-# define OSSL_CRYPTO_LHASH_H
-# pragma once
+#define OSSL_CRYPTO_LHASH_H
+#pragma once
 
 unsigned long ossl_lh_strcasehash(const char *);
 
-#endif  /* OSSL_CRYPTO_LHASH_H */
+#endif /* OSSL_CRYPTO_LHASH_H */
diff --git a/include/crypto/md32_common.h b/include/crypto/md32_common.h
index 46214f3237cc..6cc60d8d0d7d 100644
--- a/include/crypto/md32_common.h
+++ b/include/crypto/md32_common.h
@@ -64,88 +64,87 @@
  */
 
 #ifndef OSSL_CRYPTO_MD32_COMMON_H
-# define OSSL_CRYPTO_MD32_COMMON_H
-# pragma once
+#define OSSL_CRYPTO_MD32_COMMON_H
+#pragma once
 
-# include <openssl/crypto.h>
+#include <openssl/crypto.h>
 
-# if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-#  error "DATA_ORDER must be defined!"
-# endif
+#if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+#error "DATA_ORDER must be defined!"
+#endif
 
-# ifndef HASH_CBLOCK
-#  error "HASH_CBLOCK must be defined!"
-# endif
-# ifndef HASH_LONG
-#  error "HASH_LONG must be defined!"
-# endif
-# ifndef HASH_CTX
-#  error "HASH_CTX must be defined!"
-# endif
+#ifndef HASH_CBLOCK
+#error "HASH_CBLOCK must be defined!"
+#endif
+#ifndef HASH_LONG
+#error "HASH_LONG must be defined!"
+#endif
+#ifndef HASH_CTX
+#error "HASH_CTX must be defined!"
+#endif
 
-# ifndef HASH_UPDATE
-#  error "HASH_UPDATE must be defined!"
-# endif
-# ifndef HASH_TRANSFORM
-#  error "HASH_TRANSFORM must be defined!"
-# endif
-# ifndef HASH_FINAL
-#  error "HASH_FINAL must be defined!"
-# endif
+#ifndef HASH_UPDATE
+#error "HASH_UPDATE must be defined!"
+#endif
+#ifndef HASH_TRANSFORM
+#error "HASH_TRANSFORM must be defined!"
+#endif
+#ifndef HASH_FINAL
+#error "HASH_FINAL must be defined!"
+#endif
 
-# ifndef HASH_BLOCK_DATA_ORDER
-#  error "HASH_BLOCK_DATA_ORDER must be defined!"
-# endif
+#ifndef HASH_BLOCK_DATA_ORDER
+#error "HASH_BLOCK_DATA_ORDER must be defined!"
+#endif
 
-# define ROTATE(a,n)     (((a)<<(n))|(((a)&0xffffffff)>>(32-(n))))
+#define ROTATE(a, n) (((a) << (n)) | (((a) & 0xffffffff) >> (32 - (n))))
 
 #ifndef PEDANTIC
-# if defined(__GNUC__) && __GNUC__>=2 && \
-     !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-#  if defined(__riscv_zbb) || defined(__riscv_zbkb)
-#   if __riscv_xlen == 64
-#   undef ROTATE
-#   define ROTATE(x, n) ({ MD32_REG_T ret;            \
+#if defined(__GNUC__) && __GNUC__ >= 2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
+#if defined(__riscv_zbb) || defined(__riscv_zbkb)
+#if __riscv_xlen == 64
+#undef ROTATE
+#define ROTATE(x, n) ({ MD32_REG_T ret;            \
                        asm ("roriw %0, %1, %2"        \
                        : "=r"(ret)                    \
-                       : "r"(x), "i"(32 - (n))); ret;})
-#   endif
-#   if __riscv_xlen == 32
-#   undef ROTATE
-#   define ROTATE(x, n) ({ MD32_REG_T ret;            \
+                       : "r"(x), "i"(32 - (n))); ret; })
+#endif
+#if __riscv_xlen == 32
+#undef ROTATE
+#define ROTATE(x, n) ({ MD32_REG_T ret;            \
                        asm ("rori %0, %1, %2"         \
                        : "=r"(ret)                    \
-                       : "r"(x), "i"(32 - (n))); ret;})
-#   endif
-#  endif
-# endif
+                       : "r"(x), "i"(32 - (n))); ret; })
+#endif
+#endif
+#endif
 #endif
 
-# if defined(DATA_ORDER_IS_BIG_ENDIAN)
+#if defined(DATA_ORDER_IS_BIG_ENDIAN)
 
-#  define HOST_c2l(c,l)  (l =(((unsigned long)(*((c)++)))<<24),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))    )           )
-#  define HOST_l2c(l,c)  (*((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         l)
+#define HOST_c2l(c, l) (l = (((unsigned long)(*((c)++))) << 24), \
+    l |= (((unsigned long)(*((c)++))) << 16),                    \
+    l |= (((unsigned long)(*((c)++))) << 8),                     \
+    l |= (((unsigned long)(*((c)++)))))
+#define HOST_l2c(l, c) (*((c)++) = (unsigned char)(((l) >> 24) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 16) & 0xff),                     \
+    *((c)++) = (unsigned char)(((l) >> 8) & 0xff),                      \
+    *((c)++) = (unsigned char)(((l)) & 0xff),                           \
+    l)
 
-# elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
 
-#  define HOST_c2l(c,l)  (l =(((unsigned long)(*((c)++)))    ),          \
-                         l|=(((unsigned long)(*((c)++)))<< 8),          \
-                         l|=(((unsigned long)(*((c)++)))<<16),          \
-                         l|=(((unsigned long)(*((c)++)))<<24)           )
-#  define HOST_l2c(l,c)  (*((c)++)=(unsigned char)(((l)    )&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff),      \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff),      \
-                         l)
+#define HOST_c2l(c, l) (l = (((unsigned long)(*((c)++)))), \
+    l |= (((unsigned long)(*((c)++))) << 8),               \
+    l |= (((unsigned long)(*((c)++))) << 16),              \
+    l |= (((unsigned long)(*((c)++))) << 24))
+#define HOST_l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8) & 0xff),                \
+    *((c)++) = (unsigned char)(((l) >> 16) & 0xff),               \
+    *((c)++) = (unsigned char)(((l) >> 24) & 0xff),               \
+    l)
 
-# endif
+#endif
 
 /*
  * Time for some action :-)
@@ -161,11 +160,11 @@ int HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
     if (len == 0)
         return 1;
 
-    l = (c->Nl + (((HASH_LONG) len) << 3)) & 0xffffffffUL;
-    if (l < c->Nl)              /* overflow */
+    l = (c->Nl + (((HASH_LONG)len) << 3)) & 0xffffffffUL;
+    if (l < c->Nl) /* overflow */
         c->Nh++;
-    c->Nh += (HASH_LONG) (len >> 29); /* might cause compiler warning on
-                                       * 16-bit */
+    c->Nh += (HASH_LONG)(len >> 29); /* might cause compiler warning on
+                                      * 16-bit */
     c->Nl = l;
 
     n = c->num;
@@ -219,7 +218,7 @@ int HASH_FINAL(unsigned char *md, HASH_CTX *c)
     unsigned char *p = (unsigned char *)c->data;
     size_t n = c->num;
 
-    p[n] = 0x80;                /* there is always room for one */
+    p[n] = 0x80; /* there is always room for one */
     n++;
 
     if (n > (HASH_CBLOCK - 8)) {
@@ -230,30 +229,30 @@ int HASH_FINAL(unsigned char *md, HASH_CTX *c)
     memset(p + n, 0, HASH_CBLOCK - 8 - n);
 
     p += HASH_CBLOCK - 8;
-# if   defined(DATA_ORDER_IS_BIG_ENDIAN)
+#if defined(DATA_ORDER_IS_BIG_ENDIAN)
     (void)HOST_l2c(c->Nh, p);
     (void)HOST_l2c(c->Nl, p);
-# elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
+#elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
     (void)HOST_l2c(c->Nl, p);
     (void)HOST_l2c(c->Nh, p);
-# endif
+#endif
     p -= HASH_CBLOCK;
     HASH_BLOCK_DATA_ORDER(c, p, 1);
     c->num = 0;
     OPENSSL_cleanse(p, HASH_CBLOCK);
 
-# ifndef HASH_MAKE_STRING
-#  error "HASH_MAKE_STRING must be defined!"
-# else
+#ifndef HASH_MAKE_STRING
+#error "HASH_MAKE_STRING must be defined!"
+#else
     HASH_MAKE_STRING(c, md);
-# endif
+#endif
 
     return 1;
 }
 
-# ifndef MD32_REG_T
-#  if defined(__alpha) || defined(__sparcv9) || defined(__mips)
-#   define MD32_REG_T long
+#ifndef MD32_REG_T
+#if defined(__alpha) || defined(__sparcv9) || defined(__mips)
+#define MD32_REG_T long
 /*
  * This comment was originally written for MD5, which is why it
  * discusses A-D. But it basically applies to all 32-bit digests,
@@ -270,15 +269,15 @@ int HASH_FINAL(unsigned char *md, HASH_CTX *c)
  * Well, to be honest it should say that this *prevents*
  * performance degradation.
  */
-#  else
+#else
 /*
  * Above is not absolute and there are LP64 compilers that
  * generate better code if MD32_REG_T is defined int. The above
  * pre-processor condition reflects the circumstances under which
  * the conclusion was made and is subject to further extension.
  */
-#   define MD32_REG_T int
-#  endif
-# endif
+#define MD32_REG_T int
+#endif
+#endif
 
 #endif
diff --git a/include/crypto/ml_dsa.h b/include/crypto/ml_dsa.h
index 0df86dfb8c8c..d1b65b84f4dc 100644
--- a/include/crypto/ml_dsa.h
+++ b/include/crypto/ml_dsa.h
@@ -10,42 +10,42 @@
 /* Internal ML_DSA functions for other submodules, not for application use */
 
 #ifndef OSSL_CRYPTO_ML_DSA_H
-# define OSSL_CRYPTO_ML_DSA_H
+#define OSSL_CRYPTO_ML_DSA_H
 
-# pragma once
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include "crypto/types.h"
+#pragma once
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include "crypto/types.h"
 
-# define ML_DSA_MAX_CONTEXT_STRING_LEN 255
-# define ML_DSA_SEED_BYTES 32
+#define ML_DSA_MAX_CONTEXT_STRING_LEN 255
+#define ML_DSA_SEED_BYTES 32
 
-# define ML_DSA_ENTROPY_LEN 32
+#define ML_DSA_ENTROPY_LEN 32
 
 /* See FIPS 204 Section 4 Table 1 & Table 2 */
-# define ML_DSA_44_PRIV_LEN 2560
-# define ML_DSA_44_PUB_LEN 1312
-# define ML_DSA_44_SIG_LEN 2420
+#define ML_DSA_44_PRIV_LEN 2560
+#define ML_DSA_44_PUB_LEN 1312
+#define ML_DSA_44_SIG_LEN 2420
 
 /* See FIPS 204 Section 4 Table 1 & Table 2 */
-# define ML_DSA_65_PRIV_LEN 4032
-# define ML_DSA_65_PUB_LEN 1952
-# define ML_DSA_65_SIG_LEN 3309
+#define ML_DSA_65_PRIV_LEN 4032
+#define ML_DSA_65_PUB_LEN 1952
+#define ML_DSA_65_SIG_LEN 3309
 
 /* See FIPS 204 Section 4 Table 1 & Table 2 */
-# define ML_DSA_87_PRIV_LEN 4896
-# define ML_DSA_87_PUB_LEN 2592
-# define ML_DSA_87_SIG_LEN 4627
+#define ML_DSA_87_PRIV_LEN 4896
+#define ML_DSA_87_PUB_LEN 2592
+#define ML_DSA_87_SIG_LEN 4627
 
 /* Key and signature size maxima taken from values above */
-# define MAX_ML_DSA_PRIV_LEN ML_DSA_87_PRIV_LEN
-# define MAX_ML_DSA_PUB_LEN ML_DSA_87_PUB_LEN
-# define MAX_ML_DSA_SIG_LEN ML_DSA_87_SIG_LEN
+#define MAX_ML_DSA_PRIV_LEN ML_DSA_87_PRIV_LEN
+#define MAX_ML_DSA_PUB_LEN ML_DSA_87_PUB_LEN
+#define MAX_ML_DSA_SIG_LEN ML_DSA_87_SIG_LEN
 
-# define ML_DSA_KEY_PREFER_SEED (1 << 0)
-# define ML_DSA_KEY_RETAIN_SEED (1 << 1)
+#define ML_DSA_KEY_PREFER_SEED (1 << 0)
+#define ML_DSA_KEY_RETAIN_SEED (1 << 1)
 /* Default provider flags */
-# define ML_DSA_KEY_PROV_FLAGS_DEFAULT \
+#define ML_DSA_KEY_PROV_FLAGS_DEFAULT \
     (ML_DSA_KEY_PREFER_SEED | ML_DSA_KEY_RETAIN_SEED)
 
 /*
@@ -55,14 +55,14 @@
 typedef struct ml_dsa_params_st {
     const char *alg;
     int evp_type;
-    int tau;    /* Number of +/-1's in polynomial c */
+    int tau; /* Number of +/-1's in polynomial c */
     int bit_strength; /* The collision strength (lambda) */
     int gamma1; /* coefficient range of y */
     int gamma2; /* low-order rounding range */
     size_t k, l; /* matrix dimensions of 'A' */
-    int eta;    /* Private key range */
-    int beta;   /* tau * eta */
-    int omega;  /* Number of 1's in the hint 'h' */
+    int eta; /* Private key range */
+    int beta; /* tau * eta */
+    int omega; /* Number of 1's in the hint 'h' */
     int security_category; /* Category is related to Security strength */
     size_t sk_len; /* private key size */
     size_t pk_len; /* public key size */
@@ -75,7 +75,7 @@ typedef struct ml_dsa_key_st ML_DSA_KEY;
 const ML_DSA_PARAMS *ossl_ml_dsa_params_get(int evp_type);
 const ML_DSA_PARAMS *ossl_ml_dsa_key_params(const ML_DSA_KEY *key);
 __owur ML_DSA_KEY *ossl_ml_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
-                                       int evp_type);
+    int evp_type);
 /* Factory reset for keys that fail initialisation */
 void ossl_ml_dsa_key_reset(ML_DSA_KEY *key);
 __owur int ossl_ml_dsa_key_pub_alloc(ML_DSA_KEY *key);
@@ -83,7 +83,7 @@ __owur int ossl_ml_dsa_key_priv_alloc(ML_DSA_KEY *key);
 void ossl_ml_dsa_key_free(ML_DSA_KEY *key);
 __owur ML_DSA_KEY *ossl_ml_dsa_key_dup(const ML_DSA_KEY *src, int selection);
 __owur int ossl_ml_dsa_key_equal(const ML_DSA_KEY *key1, const ML_DSA_KEY *key2,
-                                 int selection);
+    int selection);
 __owur int ossl_ml_dsa_key_has(const ML_DSA_KEY *key, int selection);
 __owur int ossl_ml_dsa_key_pairwise_check(const ML_DSA_KEY *key);
 __owur int ossl_ml_dsa_generate_key(ML_DSA_KEY *out);
@@ -94,8 +94,8 @@ __owur size_t ossl_ml_dsa_key_get_priv_len(const ML_DSA_KEY *key);
 __owur const uint8_t *ossl_ml_dsa_key_get_seed(const ML_DSA_KEY *key);
 __owur int ossl_ml_dsa_key_get_prov_flags(const ML_DSA_KEY *key);
 int ossl_ml_dsa_set_prekey(ML_DSA_KEY *key, int flags_set, int flags_clr,
-                           const uint8_t *seed, size_t seed_len,
-                           const uint8_t *sk, size_t sk_len);
+    const uint8_t *seed, size_t seed_len,
+    const uint8_t *sk, size_t sk_len);
 __owur size_t ossl_ml_dsa_key_get_collision_strength_bits(const ML_DSA_KEY *key);
 __owur size_t ossl_ml_dsa_key_get_sig_len(const ML_DSA_KEY *key);
 __owur int ossl_ml_dsa_key_matches(const ML_DSA_KEY *key, int evp_type);
@@ -107,13 +107,13 @@ __owur int ossl_ml_dsa_pk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_l
 __owur int ossl_ml_dsa_sk_decode(ML_DSA_KEY *key, const uint8_t *in, size_t in_len);
 
 __owur int ossl_ml_dsa_sign(const ML_DSA_KEY *priv, int msg_is_mu,
-                            const uint8_t *msg, size_t msg_len,
-                            const uint8_t *context, size_t context_len,
-                            const uint8_t *rand, size_t rand_len, int encode,
-                            unsigned char *sig, size_t *siglen, size_t sigsize);
+    const uint8_t *msg, size_t msg_len,
+    const uint8_t *context, size_t context_len,
+    const uint8_t *rand, size_t rand_len, int encode,
+    unsigned char *sig, size_t *siglen, size_t sigsize);
 __owur int ossl_ml_dsa_verify(const ML_DSA_KEY *pub, int msg_is_mu,
-                              const uint8_t *msg, size_t msg_len,
-                              const uint8_t *context, size_t context_len,
-                              int encode, const uint8_t *sig, size_t sig_len);
+    const uint8_t *msg, size_t msg_len,
+    const uint8_t *context, size_t context_len,
+    int encode, const uint8_t *sig, size_t sig_len);
 
 #endif /* OSSL_CRYPTO_SLH_DSA_H */
diff --git a/include/crypto/ml_kem.h b/include/crypto/ml_kem.h
index 67d55697e9e3..dbe91923647c 100644
--- a/include/crypto/ml_kem.h
+++ b/include/crypto/ml_kem.h
@@ -8,22 +8,22 @@
  */
 
 #ifndef OPENSSL_HEADER_ML_KEM_H
-# define OPENSSL_HEADER_ML_KEM_H
-# pragma once
+#define OPENSSL_HEADER_ML_KEM_H
+#pragma once
 
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-# include <openssl/core_dispatch.h>
-# include <crypto/evp.h>
+#include <openssl/e_os2.h>
+#include <openssl/bio.h>
+#include <openssl/core_dispatch.h>
+#include <crypto/evp.h>
 
-# define ML_KEM_DEGREE 256
+#define ML_KEM_DEGREE 256
 /*
  * With (q-1) an odd multiple of 256, and 17 ("zeta") as a primitive 256th root
  * of unity, the polynomial (X^256+1) splits in Z_q[X] into 128 irreducible
  * quadratic factors of the form (X^2 - zeta^(2i + 1)).  This is used to
  * implement efficient multiplication in the ring R_q via the "NTT" transform.
  */
-# define ML_KEM_PRIME          (ML_KEM_DEGREE * 13 + 1)
+#define ML_KEM_PRIME (ML_KEM_DEGREE * 13 + 1)
 
 /*
  * Various ML-KEM primitives need random input, 32-bytes at a time.  Key
@@ -44,15 +44,15 @@
  * Note that the matrix "m" we store in the public key is the transpose of the
  * "A" matrix from FIPS 203!
  */
-# define ML_KEM_RANDOM_BYTES    32 /* rho, sigma, ... */
-# define ML_KEM_SEED_BYTES      (ML_KEM_RANDOM_BYTES * 2) /* Keygen (d, z) */
+#define ML_KEM_RANDOM_BYTES 32 /* rho, sigma, ... */
+#define ML_KEM_SEED_BYTES (ML_KEM_RANDOM_BYTES * 2) /* Keygen (d, z) */
 
-# define ML_KEM_PKHASH_BYTES        32 /* Salts the shared-secret */
-# define ML_KEM_SHARED_SECRET_BYTES 32
+#define ML_KEM_PKHASH_BYTES 32 /* Salts the shared-secret */
+#define ML_KEM_SHARED_SECRET_BYTES 32
 
-# if ML_KEM_PKHASH_BYTES != ML_KEM_RANDOM_BYTES
-#  error "unexpected ML-KEM public key hash size"
-# endif
+#if ML_KEM_PKHASH_BYTES != ML_KEM_RANDOM_BYTES
+#error "unexpected ML-KEM public key hash size"
+#endif
 
 /*-
  * The ML-KEM specification can be found in
@@ -90,42 +90,42 @@
  * Variant-specific constants and structures
  * -----------------------------------------
  */
-# define EVP_PKEY_ML_KEM_512    NID_ML_KEM_512
-# define ML_KEM_512_BITS        512
-# define ML_KEM_512_RANK        2
-# define ML_KEM_512_ETA1        3
-# define ML_KEM_512_ETA2        2
-# define ML_KEM_512_DU          10
-# define ML_KEM_512_DV          4
-# define ML_KEM_512_SECBITS     128
+#define EVP_PKEY_ML_KEM_512 NID_ML_KEM_512
+#define ML_KEM_512_BITS 512
+#define ML_KEM_512_RANK 2
+#define ML_KEM_512_ETA1 3
+#define ML_KEM_512_ETA2 2
+#define ML_KEM_512_DU 10
+#define ML_KEM_512_DV 4
+#define ML_KEM_512_SECBITS 128
 
-# define EVP_PKEY_ML_KEM_768    NID_ML_KEM_768
-# define ML_KEM_768_BITS        768
-# define ML_KEM_768_RANK        3
-# define ML_KEM_768_ETA1        2
-# define ML_KEM_768_ETA2        2
-# define ML_KEM_768_DU          10
-# define ML_KEM_768_DV          4
-# define ML_KEM_768_SECBITS     192
+#define EVP_PKEY_ML_KEM_768 NID_ML_KEM_768
+#define ML_KEM_768_BITS 768
+#define ML_KEM_768_RANK 3
+#define ML_KEM_768_ETA1 2
+#define ML_KEM_768_ETA2 2
+#define ML_KEM_768_DU 10
+#define ML_KEM_768_DV 4
+#define ML_KEM_768_SECBITS 192
 
-# define EVP_PKEY_ML_KEM_1024   NID_ML_KEM_1024
-# define ML_KEM_1024_BITS       1024
-# define ML_KEM_1024_RANK       4
-# define ML_KEM_1024_ETA1       2
-# define ML_KEM_1024_ETA2       2
-# define ML_KEM_1024_DU         11
-# define ML_KEM_1024_DV         5
-# define ML_KEM_1024_SECBITS    256
+#define EVP_PKEY_ML_KEM_1024 NID_ML_KEM_1024
+#define ML_KEM_1024_BITS 1024
+#define ML_KEM_1024_RANK 4
+#define ML_KEM_1024_ETA1 2
+#define ML_KEM_1024_ETA2 2
+#define ML_KEM_1024_DU 11
+#define ML_KEM_1024_DV 5
+#define ML_KEM_1024_SECBITS 256
 
-# define ML_KEM_KEY_RANDOM_PCT  (1 << 0)
-# define ML_KEM_KEY_FIXED_PCT   (1 << 1)
-# define ML_KEM_KEY_PREFER_SEED (1 << 2)
-# define ML_KEM_KEY_RETAIN_SEED (1 << 3)
+#define ML_KEM_KEY_RANDOM_PCT (1 << 0)
+#define ML_KEM_KEY_FIXED_PCT (1 << 1)
+#define ML_KEM_KEY_PREFER_SEED (1 << 2)
+#define ML_KEM_KEY_RETAIN_SEED (1 << 3)
 /* Mask to check whether PCT on import is enabled */
-# define ML_KEM_KEY_PCT_TYPE \
+#define ML_KEM_KEY_PCT_TYPE \
     (ML_KEM_KEY_RANDOM_PCT | ML_KEM_KEY_FIXED_PCT)
 /* Default provider flags */
-# define ML_KEM_KEY_PROV_FLAGS_DEFAULT \
+#define ML_KEM_KEY_PROV_FLAGS_DEFAULT \
     (ML_KEM_KEY_RANDOM_PCT | ML_KEM_KEY_PREFER_SEED | ML_KEM_KEY_RETAIN_SEED)
 
 /*
@@ -150,7 +150,7 @@ typedef struct {
     int secbits;
 } ML_KEM_VINFO;
 
-/* Retrive global variant-specific parameters */
+/* Retrieve global variant-specific parameters */
 const ML_KEM_VINFO *ossl_ml_kem_get_vinfo(int evp_type);
 
 /* Known as ML_KEM_KEY via crypto/types.h */
@@ -175,14 +175,14 @@ typedef struct ossl_ml_kem_key_st {
      * storage is allocated once a public or private key is specified, at
      * which point the key becomes immutable.
      */
-    uint8_t *rho;                           /* Public matrix seed */
-    uint8_t *pkhash;                        /* Public key hash */
-    struct ossl_ml_kem_scalar_st *t;        /* Public key vector */
-    struct ossl_ml_kem_scalar_st *m;        /* Pre-computed pubkey matrix */
-    struct ossl_ml_kem_scalar_st *s;        /* Private key secret vector */
-    uint8_t *z;                             /* Private key FO failure secret */
-    uint8_t *d;                             /* Private key seed */
-    int prov_flags;                         /* prefer/retain seed and PCT flags */
+    uint8_t *rho; /* Public matrix seed */
+    uint8_t *pkhash; /* Public key hash */
+    struct ossl_ml_kem_scalar_st *t; /* Public key vector */
+    struct ossl_ml_kem_scalar_st *m; /* Pre-computed pubkey matrix */
+    struct ossl_ml_kem_scalar_st *s; /* Private key secret vector */
+    uint8_t *z; /* Private key FO failure secret */
+    uint8_t *d; /* Private key seed */
+    int prov_flags; /* prefer/retain seed and PCT flags */
 
     /*
      * Fixed-size built-in buffer, which holds the |rho| and the public key
@@ -190,18 +190,18 @@ typedef struct ossl_ml_kem_key_st {
      * With seed-only keys, that are not yet expanded, this instead holds the
      * |z| and |d| components in that order.
      */
-    uint8_t seedbuf[64];                    /* |rho| + |pkhash| / |z| + |d| */
-    uint8_t *encoded_dk;                    /* Unparsed P8 private key */
+    uint8_t seedbuf[64]; /* |rho| + |pkhash| / |z| + |d| */
+    uint8_t *encoded_dk; /* Unparsed P8 private key */
 } ML_KEM_KEY;
 
 /* The public key is always present, when the private is */
-# define ossl_ml_kem_key_vinfo(key)     ((key)->vinfo)
-# define ossl_ml_kem_have_pubkey(key)   ((key)->t != NULL)
-# define ossl_ml_kem_have_prvkey(key)   ((key)->s != NULL)
-# define ossl_ml_kem_have_seed(key)     ((key)->d != NULL)
-# define ossl_ml_kem_have_dkenc(key)    ((key)->encoded_dk != NULL)
-# define ossl_ml_kem_decoded_key(key)   ((key)->encoded_dk != NULL \
-                                         || ((key)->s == NULL && (key)->d != NULL))
+#define ossl_ml_kem_key_vinfo(key) ((key)->vinfo)
+#define ossl_ml_kem_have_pubkey(key) ((key)->t != NULL)
+#define ossl_ml_kem_have_prvkey(key) ((key)->s != NULL)
+#define ossl_ml_kem_have_seed(key) ((key)->d != NULL)
+#define ossl_ml_kem_have_dkenc(key) ((key)->encoded_dk != NULL)
+#define ossl_ml_kem_decoded_key(key) ((key)->encoded_dk != NULL \
+    || ((key)->s == NULL && (key)->d != NULL))
 
 /*
  * ----- ML-KEM key lifecycle
@@ -212,7 +212,7 @@ typedef struct ossl_ml_kem_key_st {
  * or private key material.
  */
 ML_KEM_KEY *ossl_ml_kem_key_new(OSSL_LIB_CTX *libctx, const char *properties,
-                                int evp_type);
+    int evp_type);
 /* Reset a key clearing all public and private key material */
 void ossl_ml_kem_key_reset(ML_KEM_KEY *key);
 /* Deallocate the key */
@@ -234,48 +234,38 @@ ML_KEM_KEY *ossl_ml_kem_key_dup(const ML_KEM_KEY *key, int selection);
  *
  * Return 1 on success, 0 otherwise.
  */
-__owur
-int ossl_ml_kem_parse_public_key(const uint8_t *in, size_t len,
-                                 ML_KEM_KEY *key);
-__owur
-int ossl_ml_kem_parse_private_key(const uint8_t *in, size_t len,
-                                  ML_KEM_KEY *key);
+__owur int ossl_ml_kem_parse_public_key(const uint8_t *in, size_t len,
+    ML_KEM_KEY *key);
+__owur int ossl_ml_kem_parse_private_key(const uint8_t *in, size_t len,
+    ML_KEM_KEY *key);
 ML_KEM_KEY *ossl_ml_kem_set_seed(const uint8_t *seed, size_t seedlen,
-                                 ML_KEM_KEY *key);
-__owur
-int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key);
+    ML_KEM_KEY *key);
+__owur int ossl_ml_kem_genkey(uint8_t *pubenc, size_t publen, ML_KEM_KEY *key);
 
 /*
  * Perform an ML-KEM operation with a given ML-KEM key.  The key can generally
  * be either a private or public key, with the exception of encoding a private
  * key or performing KEM decapsulation.
  */
-__owur
-int ossl_ml_kem_encode_public_key(uint8_t *out, size_t len,
-                                  const ML_KEM_KEY *key);
-__owur
-int ossl_ml_kem_encode_private_key(uint8_t *out, size_t len,
-                                   const ML_KEM_KEY *key);
-__owur
-int ossl_ml_kem_encode_seed(uint8_t *out, size_t len,
-                            const ML_KEM_KEY *key);
+__owur int ossl_ml_kem_encode_public_key(uint8_t *out, size_t len,
+    const ML_KEM_KEY *key);
+__owur int ossl_ml_kem_encode_private_key(uint8_t *out, size_t len,
+    const ML_KEM_KEY *key);
+__owur int ossl_ml_kem_encode_seed(uint8_t *out, size_t len,
+    const ML_KEM_KEY *key);
 
-__owur
-int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
-                           uint8_t *shared_secret, size_t slen,
-                           const uint8_t *entropy, size_t elen,
-                           const ML_KEM_KEY *key);
-__owur
-int ossl_ml_kem_encap_rand(uint8_t *ctext, size_t clen,
-                           uint8_t *shared_secret, size_t slen,
-                           const ML_KEM_KEY *key);
-__owur
-int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
-                      const uint8_t *ctext, size_t clen,
-                      const ML_KEM_KEY *key);
+__owur int ossl_ml_kem_encap_seed(uint8_t *ctext, size_t clen,
+    uint8_t *shared_secret, size_t slen,
+    const uint8_t *entropy, size_t elen,
+    const ML_KEM_KEY *key);
+__owur int ossl_ml_kem_encap_rand(uint8_t *ctext, size_t clen,
+    uint8_t *shared_secret, size_t slen,
+    const ML_KEM_KEY *key);
+__owur int ossl_ml_kem_decap(uint8_t *shared_secret, size_t slen,
+    const uint8_t *ctext, size_t clen,
+    const ML_KEM_KEY *key);
 
 /* Compare the public key hashes of two keys */
-__owur
-int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2);
+__owur int ossl_ml_kem_pubkey_cmp(const ML_KEM_KEY *key1, const ML_KEM_KEY *key2);
 
-#endif  /* OPENSSL_HEADER_ML_KEM_H */
+#endif /* OPENSSL_HEADER_ML_KEM_H */
diff --git a/include/crypto/modes.h b/include/crypto/modes.h
index d03ca83d00f2..918d4e04b540 100644
--- a/include/crypto/modes.h
+++ b/include/crypto/modes.h
@@ -13,15 +13,15 @@
 #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
 typedef __int64 i64;
 typedef unsigned __int64 u64;
-# define U64(C) C##UI64
+#define U64(C) C##UI64
 #elif defined(__arch64__)
 typedef long i64;
 typedef unsigned long u64;
-# define U64(C) C##UL
+#define U64(C) C##UL
 #else
 typedef long long i64;
 typedef unsigned long long u64;
-# define U64(C) C##ULL
+#define U64(C) C##ULL
 #endif
 
 typedef unsigned int u32;
@@ -29,79 +29,74 @@ typedef unsigned char u8;
 
 #define STRICT_ALIGNMENT 1
 #ifndef PEDANTIC
-# if defined(__i386)    || defined(__i386__)    || \
-     defined(__x86_64)  || defined(__x86_64__)  || \
-     defined(_M_IX86)   || defined(_M_AMD64)    || defined(_M_X64) || \
-     defined(__aarch64__)                       || \
-     defined(__s390__)  || defined(__s390x__)
-#  undef STRICT_ALIGNMENT
-# endif
+#if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__aarch64__) || defined(__s390__) || defined(__s390x__)
+#undef STRICT_ALIGNMENT
+#endif
 #endif
 
 #if !defined(PEDANTIC) && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM)
-# if defined(__GNUC__) && __GNUC__>=2
-#  if defined(__x86_64) || defined(__x86_64__)
-#   define BSWAP8(x) ({ u64 ret_=(x);                   \
+#if defined(__GNUC__) && __GNUC__ >= 2
+#if defined(__x86_64) || defined(__x86_64__)
+#define BSWAP8(x) ({ u64 ret_=(x);                   \
                         asm ("bswapq %0"                \
-                        : "+r"(ret_));   ret_;          })
-#   define BSWAP4(x) ({ u32 ret_=(x);                   \
+                        : "+r"(ret_));   ret_; })
+#define BSWAP4(x) ({ u32 ret_=(x);                   \
                         asm ("bswapl %0"                \
-                        : "+r"(ret_));   ret_;          })
-#  elif (defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)
-#   define BSWAP8(x) ({ u32 lo_=(u64)(x)>>32,hi_=(x);   \
+                        : "+r"(ret_));   ret_; })
+#elif (defined(__i386) || defined(__i386__)) && !defined(I386_ONLY)
+#define BSWAP8(x) ({ u32 lo_=(u64)(x)>>32,hi_=(x);   \
                         asm ("bswapl %0; bswapl %1"     \
                         : "+r"(hi_),"+r"(lo_));         \
-                        (u64)hi_<<32|lo_;               })
-#   define BSWAP4(x) ({ u32 ret_=(x);                   \
+                        (u64)hi_<<32|lo_; })
+#define BSWAP4(x) ({ u32 ret_=(x);                   \
                         asm ("bswapl %0"                \
-                        : "+r"(ret_));   ret_;          })
-#  elif defined(__aarch64__)
-#   if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-       __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__
-#    define BSWAP8(x) ({ u64 ret_;                       \
+                        : "+r"(ret_));   ret_; })
+#elif defined(__aarch64__)
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
+#define BSWAP8(x) ({ u64 ret_;                       \
                         asm ("rev %0,%1"                \
-                        : "=r"(ret_) : "r"(x)); ret_;   })
-#    define BSWAP4(x) ({ u32 ret_;                       \
+                        : "=r"(ret_) : "r"(x)); ret_; })
+#define BSWAP4(x) ({ u32 ret_;                       \
                         asm ("rev %w0,%w1"              \
-                        : "=r"(ret_) : "r"(x)); ret_;   })
-#   endif
-#  elif (defined(__arm__) || defined(__arm)) && !defined(STRICT_ALIGNMENT)
-#   define BSWAP8(x) ({ u32 lo_=(u64)(x)>>32,hi_=(x);   \
+                        : "=r"(ret_) : "r"(x)); ret_; })
+#endif
+#elif (defined(__arm__) || defined(__arm)) && !defined(STRICT_ALIGNMENT)
+#define BSWAP8(x) ({ u32 lo_=(u64)(x)>>32,hi_=(x);   \
                         asm ("rev %0,%0; rev %1,%1"     \
                         : "+r"(hi_),"+r"(lo_));         \
-                        (u64)hi_<<32|lo_;               })
-#   define BSWAP4(x) ({ u32 ret_;                       \
+                        (u64)hi_<<32|lo_; })
+#define BSWAP4(x) ({ u32 ret_;                       \
                         asm ("rev %0,%1"                \
                         : "=r"(ret_) : "r"((u32)(x)));  \
-                        ret_;                           })
-#  elif (defined(__riscv_zbb) || defined(__riscv_zbkb)) && __riscv_xlen == 64
-#   define BSWAP8(x) ({ u64 ret_=(x);                   \
+                        ret_; })
+#elif (defined(__riscv_zbb) || defined(__riscv_zbkb)) && __riscv_xlen == 64
+#define BSWAP8(x) ({ u64 ret_=(x);                   \
                         asm ("rev8 %0,%0"               \
-                        : "+r"(ret_));   ret_;          })
-#   define BSWAP4(x) ({ u32 ret_=(x);                   \
+                        : "+r"(ret_));   ret_; })
+#define BSWAP4(x) ({ u32 ret_=(x);                   \
                         asm ("rev8 %0,%0; srli %0,%0,32"\
-                        : "+&r"(ret_));  ret_;          })
-#  endif
-# elif defined(_MSC_VER)
-#  if _MSC_VER>=1300
-#   include <stdlib.h>
-#   pragma intrinsic(_byteswap_uint64,_byteswap_ulong)
-#   define BSWAP8(x)    _byteswap_uint64((u64)(x))
-#   define BSWAP4(x)    _byteswap_ulong((u32)(x))
-#  elif defined(_M_IX86)
-__inline u32 _bswap4(u32 val)
-{
-_asm mov eax, val _asm bswap eax}
-#   define BSWAP4(x)    _bswap4(x)
-#  endif
-# endif
+                        : "+&r"(ret_));  ret_; })
+#endif
+#elif defined(_MSC_VER)
+#if _MSC_VER >= 1300
+#include <stdlib.h>
+#pragma intrinsic(_byteswap_uint64, _byteswap_ulong)
+#define BSWAP8(x) _byteswap_uint64((u64)(x))
+#define BSWAP4(x) _byteswap_ulong((u32)(x))
+#elif defined(_M_IX86)
+__inline u32 _bswap4(u32 val) {
+    _asm mov eax, val _asm bswap eax
+}
+#define BSWAP4(x) _bswap4(x)
+#endif
+#endif
 #endif
 #if defined(BSWAP4) && !defined(STRICT_ALIGNMENT)
-# define GETU32(p)       BSWAP4(*(const u32 *)(p))
-# define PUTU32(p,v)     *(u32 *)(p) = BSWAP4(v)
+#define GETU32(p) BSWAP4(*(const u32 *)(p))
+#define PUTU32(p, v) *(u32 *)(p) = BSWAP4(v)
 #else
-# define GETU32(p)       ((u32)(p)[0]<<24|(u32)(p)[1]<<16|(u32)(p)[2]<<8|(u32)(p)[3])
-# define PUTU32(p,v)     ((p)[0]=(u8)((v)>>24),(p)[1]=(u8)((v)>>16),(p)[2]=(u8)((v)>>8),(p)[3]=(u8)(v))
+#define GETU32(p) ((u32)(p)[0] << 24 | (u32)(p)[1] << 16 | (u32)(p)[2] << 8 | (u32)(p)[3])
+#define PUTU32(p, v) ((p)[0] = (u8)((v) >> 24), (p)[1] = (u8)((v) >> 16), (p)[2] = (u8)((v) >> 8), (p)[3] = (u8)(v))
 #endif
 /*- GCM definitions */ typedef struct {
     u64 hi, lo;
@@ -141,14 +136,14 @@ struct gcm128_context {
 /* GHASH functions */
 void ossl_gcm_init_4bit(u128 Htable[16], const u64 H[2]);
 void ossl_gcm_ghash_4bit(u64 Xi[2], const u128 Htable[16],
-                         const u8 *inp, size_t len);
+    const u8 *inp, size_t len);
 void ossl_gcm_gmult_4bit(u64 Xi[2], const u128 Htable[16]);
 
 /*
  * The maximum permitted number of cipher blocks per data unit in XTS mode.
  * Reference IEEE Std 1619-2018.
  */
-#define XTS_MAX_BLOCKS_PER_DATA_UNIT            (1<<20)
+#define XTS_MAX_BLOCKS_PER_DATA_UNIT (1 << 20)
 
 struct xts128_context {
     void *key1, *key2;
@@ -157,9 +152,9 @@ struct xts128_context {
 
 /* XTS mode for SM4 algorithm specified by GB/T 17964-2021 */
 int ossl_crypto_xts128gb_encrypt(const XTS128_CONTEXT *ctx,
-                                 const unsigned char iv[16],
-                                 const unsigned char *inp, unsigned char *out,
-                                 size_t len, int enc);
+    const unsigned char iv[16],
+    const unsigned char *inp, unsigned char *out,
+    size_t len, int enc);
 
 struct ccm128_context {
     union {
@@ -177,15 +172,15 @@ typedef union {
     u64 a[2];
     unsigned char c[16];
 } OCB_BLOCK;
-# define ocb_block16_xor(in1,in2,out) \
-    ( (out)->a[0]=(in1)->a[0]^(in2)->a[0], \
-      (out)->a[1]=(in1)->a[1]^(in2)->a[1] )
-# if STRICT_ALIGNMENT
-#  define ocb_block16_xor_misaligned(in1,in2,out) \
-    ocb_block_xor((in1)->c,(in2)->c,16,(out)->c)
-# else
-#  define ocb_block16_xor_misaligned ocb_block16_xor
-# endif
+#define ocb_block16_xor(in1, in2, out)        \
+    ((out)->a[0] = (in1)->a[0] ^ (in2)->a[0], \
+        (out)->a[1] = (in1)->a[1] ^ (in2)->a[1])
+#if STRICT_ALIGNMENT
+#define ocb_block16_xor_misaligned(in1, in2, out) \
+    ocb_block_xor((in1)->c, (in2)->c, 16, (out)->c)
+#else
+#define ocb_block16_xor_misaligned ocb_block16_xor
+#endif
 
 struct ocb128_context {
     /* Need both encrypt and decrypt key schedules for decryption */
@@ -193,7 +188,7 @@ struct ocb128_context {
     block128_f decrypt;
     void *keyenc;
     void *keydec;
-    ocb128_f stream;    /* direction dependent */
+    ocb128_f stream; /* direction dependent */
     /* Key dependent variables. Can be reused if key remains the same */
     size_t l_index;
     size_t max_l_index;
@@ -210,14 +205,14 @@ struct ocb128_context {
         OCB_BLOCK checksum;
     } sess;
 };
-#endif                          /* OPENSSL_NO_OCB */
+#endif /* OPENSSL_NO_OCB */
 
 #ifndef OPENSSL_NO_SIV
 
 #define SIV_LEN 16
 
 typedef union siv_block_u {
-    uint64_t word[SIV_LEN/sizeof(uint64_t)];
+    uint64_t word[SIV_LEN / sizeof(uint64_t)];
     unsigned char byte[SIV_LEN];
 } SIV_BLOCK;
 
diff --git a/include/crypto/objectserr.h b/include/crypto/objectserr.h
index ec9948241c35..47fc698aa135 100644
--- a/include/crypto/objectserr.h
+++ b/include/crypto/objectserr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_OBJECTSERR_H
-# define OSSL_CRYPTO_OBJECTSERR_H
-# pragma once
+#define OSSL_CRYPTO_OBJECTSERR_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_OBJ_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/ocsperr.h b/include/crypto/ocsperr.h
index f9529b2a2f72..d05a0324c0b4 100644
--- a/include/crypto/ocsperr.h
+++ b/include/crypto/ocsperr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_OCSPERR_H
-# define OSSL_CRYPTO_OCSPERR_H
-# pragma once
+#define OSSL_CRYPTO_OCSPERR_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
 
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 
 int ossl_err_load_OCSP_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/pem.h b/include/crypto/pem.h
index f739fe03ad4e..c37f32d2e64d 100644
--- a/include/crypto/pem.h
+++ b/include/crypto/pem.h
@@ -8,44 +8,44 @@
  */
 
 #ifndef OSSL_INTERNAL_PEM_H
-# define OSSL_INTERNAL_PEM_H
-# pragma once
+#define OSSL_INTERNAL_PEM_H
+#pragma once
 
-# include <openssl/pem.h>
-# include "crypto/types.h"
+#include <openssl/pem.h>
+#include "crypto/types.h"
 
 /* Found in crypto/pem/pvkfmt.c */
 
 /* Maximum length of a blob after header */
-# define BLOB_MAX_LENGTH          102400
+#define BLOB_MAX_LENGTH 102400
 
 int ossl_do_blob_header(const unsigned char **in, unsigned int length,
-                        unsigned int *pmagic, unsigned int *pbitlen,
-                        int *pisdss, int *pispub);
+    unsigned int *pmagic, unsigned int *pbitlen,
+    int *pisdss, int *pispub);
 unsigned int ossl_blob_length(unsigned bitlen, int isdss, int ispub);
 int ossl_do_PVK_header(const unsigned char **in, unsigned int length,
-                       int skip_magic, int *isdss,
-                       unsigned int *psaltlen, unsigned int *pkeylen);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_DSA
+    int skip_magic, int *isdss,
+    unsigned int *psaltlen, unsigned int *pkeylen);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DSA
 DSA *ossl_b2i_DSA_after_header(const unsigned char **in, unsigned int bitlen,
-                               int ispub);
-#  endif
+    int ispub);
+#endif
 RSA *ossl_b2i_RSA_after_header(const unsigned char **in, unsigned int bitlen,
-                               int ispub);
-# endif
+    int ispub);
+#endif
 EVP_PKEY *ossl_b2i(const unsigned char **in, unsigned int length, int *ispub);
 EVP_PKEY *ossl_b2i_bio(BIO *in, int *ispub);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DSA
 DSA *b2i_DSA_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
 DSA *b2i_DSA_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u,
-                        OSSL_LIB_CTX *libctx, const char *propq);
-#  endif
+    OSSL_LIB_CTX *libctx, const char *propq);
+#endif
 RSA *b2i_RSA_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
 RSA *b2i_RSA_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u,
-                        OSSL_LIB_CTX *libctx, const char *propq);
-# endif
+    OSSL_LIB_CTX *libctx, const char *propq);
+#endif
 
 #endif
diff --git a/include/crypto/pemerr.h b/include/crypto/pemerr.h
index b255ff5c6488..3a2aa0226104 100644
--- a/include/crypto/pemerr.h
+++ b/include/crypto/pemerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_PEMERR_H
-# define OSSL_CRYPTO_PEMERR_H
-# pragma once
+#define OSSL_CRYPTO_PEMERR_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_PEM_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/pkcs12err.h b/include/crypto/pkcs12err.h
index 114971c607cd..d1f1a5210270 100644
--- a/include/crypto/pkcs12err.h
+++ b/include/crypto/pkcs12err.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_PKCS12ERR_H
-# define OSSL_CRYPTO_PKCS12ERR_H
-# pragma once
+#define OSSL_CRYPTO_PKCS12ERR_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_PKCS12_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/pkcs7.h b/include/crypto/pkcs7.h
index 9caa9af4a25f..bf0e6bf60749 100644
--- a/include/crypto/pkcs7.h
+++ b/include/crypto/pkcs7.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_CRYPTO_PKCS7_H
-# define OSSL_CRYPTO_PKCS7_H
-# pragma once
+#define OSSL_CRYPTO_PKCS7_H
+#pragma once
 
 void ossl_pkcs7_resolve_libctx(PKCS7 *p7);
 
diff --git a/include/crypto/pkcs7err.h b/include/crypto/pkcs7err.h
index c195190bf8f6..68d071b936fa 100644
--- a/include/crypto/pkcs7err.h
+++ b/include/crypto/pkcs7err.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_PKCS7ERR_H
-# define OSSL_CRYPTO_PKCS7ERR_H
-# pragma once
+#define OSSL_CRYPTO_PKCS7ERR_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_PKCS7_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/poly1305.h b/include/crypto/poly1305.h
index ba54f3bdcbe1..a7e1a2c28c75 100644
--- a/include/crypto/poly1305.h
+++ b/include/crypto/poly1305.h
@@ -8,27 +8,27 @@
  */
 
 #ifndef OSSL_CRYPTO_POLY1305_H
-# define OSSL_CRYPTO_POLY1305_H
-# pragma once
+#define OSSL_CRYPTO_POLY1305_H
+#pragma once
 
 #include <stddef.h>
 
-#define POLY1305_BLOCK_SIZE  16
+#define POLY1305_BLOCK_SIZE 16
 #define POLY1305_DIGEST_SIZE 16
-#define POLY1305_KEY_SIZE    32
+#define POLY1305_KEY_SIZE 32
 
 typedef struct poly1305_context POLY1305;
 
-typedef void (*poly1305_blocks_f) (void *ctx, const unsigned char *inp,
-                                   size_t len, unsigned int padbit);
-typedef void (*poly1305_emit_f) (void *ctx, unsigned char mac[16],
-                                 const unsigned int nonce[4]);
+typedef void (*poly1305_blocks_f)(void *ctx, const unsigned char *inp,
+    size_t len, unsigned int padbit);
+typedef void (*poly1305_emit_f)(void *ctx, unsigned char mac[16],
+    const unsigned int nonce[4]);
 
 struct poly1305_context {
-    double opaque[24];  /* large enough to hold internal state, declared
-                         * 'double' to ensure at least 64-bit invariant
-                         * alignment across all platforms and
-                         * configurations */
+    double opaque[24]; /* large enough to hold internal state, declared
+                        * 'double' to ensure at least 64-bit invariant
+                        * alignment across all platforms and
+                        * configurations */
     unsigned int nonce[4];
     unsigned char data[POLY1305_BLOCK_SIZE];
     size_t num;
diff --git a/include/crypto/ppc_arch.h b/include/crypto/ppc_arch.h
index d999396a2f5c..5945853ab172 100644
--- a/include/crypto/ppc_arch.h
+++ b/include/crypto/ppc_arch.h
@@ -8,7 +8,7 @@
  */
 
 #ifndef OSSL_CRYPTO_PPC_ARCH_H
-# define OSSL_CRYPTO_PPC_ARCH_H
+#define OSSL_CRYPTO_PPC_ARCH_H
 
 extern unsigned int OPENSSL_ppccap_P;
 
@@ -17,13 +17,13 @@ extern unsigned int OPENSSL_ppccap_P;
  * to reflect OpenSSL performance preferences than actual processor
  * capabilities.
  */
-# define PPC_FPU64       (1<<0)
-# define PPC_ALTIVEC     (1<<1)
-# define PPC_CRYPTO207   (1<<2)
-# define PPC_FPU         (1<<3)
-# define PPC_MADD300     (1<<4)
-# define PPC_MFTB        (1<<5)
-# define PPC_MFSPR268    (1<<6)
-# define PPC_BRD31       (1<<7)
+#define PPC_FPU64 (1 << 0)
+#define PPC_ALTIVEC (1 << 1)
+#define PPC_CRYPTO207 (1 << 2)
+#define PPC_FPU (1 << 3)
+#define PPC_MADD300 (1 << 4)
+#define PPC_MFTB (1 << 5)
+#define PPC_MFSPR268 (1 << 6)
+#define PPC_BRD31 (1 << 7)
 
 #endif
diff --git a/include/crypto/punycode.h b/include/crypto/punycode.h
index 2e1c85c1f74f..85efa7a5a476 100644
--- a/include/crypto/punycode.h
+++ b/include/crypto/punycode.h
@@ -8,17 +8,16 @@
  */
 
 #ifndef OSSL_CRYPTO_PUNYCODE_H
-# define OSSL_CRYPTO_PUNYCODE_H
-# pragma once
+#define OSSL_CRYPTO_PUNYCODE_H
+#pragma once
 
-# include <stddef.h>     /* for size_t */
+#include <stddef.h> /* for size_t */
 
-int ossl_punycode_decode (
+int ossl_punycode_decode(
     const char *pEncoded,
     const size_t enc_len,
     unsigned int *pDecoded,
-    unsigned int *pout_length
-);
+    unsigned int *pout_length);
 
 int ossl_a2ulabel(const char *in, char *out, size_t outlen);
 
diff --git a/include/crypto/rand.h b/include/crypto/rand.h
index f7c1a165b45b..712614c9c880 100644
--- a/include/crypto/rand.h
+++ b/include/crypto/rand.h
@@ -16,21 +16,20 @@
  */
 
 #ifndef OSSL_CRYPTO_RAND_H
-# define OSSL_CRYPTO_RAND_H
-# pragma once
+#define OSSL_CRYPTO_RAND_H
+#pragma once
 
-# include <openssl/rand.h>
-# include "crypto/rand_pool.h"
+#include <openssl/rand.h>
+#include "crypto/rand_pool.h"
 
-# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
-#  include <Availability.h>
-#  if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || \
-     (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
-#   define OPENSSL_APPLE_CRYPTO_RANDOM 1
-#   include <CommonCrypto/CommonCryptoError.h>
-#   include <CommonCrypto/CommonRandom.h>
-#  endif
-# endif
+#if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM)
+#include <Availability.h>
+#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
+#define OPENSSL_APPLE_CRYPTO_RANDOM 1
+#include <CommonCrypto/CommonCryptoError.h>
+#include <CommonCrypto/CommonRandom.h>
+#endif
+#endif
 
 /*
  * Defines related to seed sources
@@ -40,36 +39,36 @@
  * set this to a comma-separated list of 'random' device files to try out. By
  * default, we will try to read at least one of these files
  */
-# define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
-# if defined(__linux) && !defined(__ANDROID__)
-#  ifndef DEVRANDOM_WAIT
-#   define DEVRANDOM_WAIT   "/dev/random"
-#  endif
+#define DEVRANDOM "/dev/urandom", "/dev/random", "/dev/hwrng", "/dev/srandom"
+#if defined(__linux) && !defined(__ANDROID__)
+#ifndef DEVRANDOM_WAIT
+#define DEVRANDOM_WAIT "/dev/random"
+#endif
 /*
  * Linux kernels 4.8 and later changes how their random device works and there
  * is no reliable way to tell that /dev/urandom has been seeded -- getentropy(2)
  * should be used instead.
  */
-#  ifndef DEVRANDOM_SAFE_KERNEL
-#   define DEVRANDOM_SAFE_KERNEL        4, 8
-#  endif
+#ifndef DEVRANDOM_SAFE_KERNEL
+#define DEVRANDOM_SAFE_KERNEL 4, 8
+#endif
 /*
  * Some operating systems do not permit select(2) on their random devices,
  * defining this to zero will force the use of read(2) to extract one byte
  * from /dev/random.
  */
-#  ifndef DEVRANDM_WAIT_USE_SELECT
-#   define DEVRANDM_WAIT_USE_SELECT     1
-#  endif
+#ifndef DEVRANDM_WAIT_USE_SELECT
+#define DEVRANDM_WAIT_USE_SELECT 1
+#endif
 /*
  * Define the shared memory identifier used to indicate if the operating
  * system has properly seeded the DEVRANDOM source.
  */
-#  ifndef OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID
-#   define OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID 114
-#  endif
+#ifndef OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID
+#define OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID 114
+#endif
 
-# endif
+#endif
 #endif
 
 #if !defined(OPENSSL_NO_EGD) && !defined(DEVRANDOM_EGD)
@@ -78,7 +77,7 @@
  * sockets will be tried in the order listed in case accessing the device
  * files listed in DEVRANDOM did not return enough randomness.
  */
-# define DEVRANDOM_EGD "/var/run/egd-pool", "/dev/egd-pool", "/etc/egd-pool", "/etc/entropy"
+#define DEVRANDOM_EGD "/var/run/egd-pool", "/dev/egd-pool", "/etc/egd-pool", "/etc/entropy"
 #endif
 
 void ossl_rand_cleanup_int(void);
@@ -109,25 +108,25 @@ void ossl_random_add_conf_module(void);
  * Get and cleanup random seed material.
  */
 size_t ossl_rand_get_entropy(OSSL_LIB_CTX *ctx,
-                             unsigned char **pout, int entropy,
-                             size_t min_len, size_t max_len);
+    unsigned char **pout, int entropy,
+    size_t min_len, size_t max_len);
 size_t ossl_rand_get_user_entropy(OSSL_LIB_CTX *ctx,
-                                  unsigned char **pout, int entropy,
-                                  size_t min_len, size_t max_len);
+    unsigned char **pout, int entropy,
+    size_t min_len, size_t max_len);
 void ossl_rand_cleanup_entropy(OSSL_LIB_CTX *ctx,
-                               unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 void ossl_rand_cleanup_user_entropy(OSSL_LIB_CTX *ctx,
-                                    unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 size_t ossl_rand_get_nonce(OSSL_LIB_CTX *ctx,
-                           unsigned char **pout, size_t min_len, size_t max_len,
-                           const void *salt, size_t salt_len);
+    unsigned char **pout, size_t min_len, size_t max_len,
+    const void *salt, size_t salt_len);
 size_t ossl_rand_get_user_nonce(OSSL_LIB_CTX *ctx, unsigned char **pout,
-                                size_t min_len, size_t max_len,
-                                const void *salt, size_t salt_len);
+    size_t min_len, size_t max_len,
+    const void *salt, size_t salt_len);
 void ossl_rand_cleanup_nonce(OSSL_LIB_CTX *ctx,
-                             unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 void ossl_rand_cleanup_user_nonce(OSSL_LIB_CTX *ctx,
-                                  unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 
 /*
  * Get seeding material from the operating system sources.
@@ -135,11 +134,11 @@ void ossl_rand_cleanup_user_nonce(OSSL_LIB_CTX *ctx,
 size_t ossl_pool_acquire_entropy(RAND_POOL *pool);
 int ossl_pool_add_nonce_data(RAND_POOL *pool);
 
-# ifdef FIPS_MODULE
+#ifdef FIPS_MODULE
 EVP_RAND_CTX *ossl_rand_get0_private_noncreating(OSSL_LIB_CTX *ctx);
-# else
+#else
 EVP_RAND_CTX *ossl_rand_get0_seed_noncreating(OSSL_LIB_CTX *ctx);
-# endif
+#endif
 
 /* Generate a uniformly distributed random integer in the interval [0, upper) */
 uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err);
@@ -149,17 +148,17 @@ uint32_t ossl_rand_uniform_uint32(OSSL_LIB_CTX *ctx, uint32_t upper, int *err);
  * [lower, upper).
  */
 uint32_t ossl_rand_range_uint32(OSSL_LIB_CTX *ctx, uint32_t lower, uint32_t upper,
-                                int *err);
+    int *err);
 
 /*
  * Check if the named provider is the nominated entropy/random provider.
  * If it is, use it.
  */
-# ifndef FIPS_MODULE
+#ifndef FIPS_MODULE
 int ossl_rand_check_random_provider_on_load(OSSL_LIB_CTX *ctx,
-                                            OSSL_PROVIDER *prov);
+    OSSL_PROVIDER *prov);
 int ossl_rand_check_random_provider_on_unload(OSSL_LIB_CTX *ctx,
-                                              OSSL_PROVIDER *prov);
-# endif     /* FIPS_MODULE */
+    OSSL_PROVIDER *prov);
+#endif /* FIPS_MODULE */
 
 #endif
diff --git a/include/crypto/rand_pool.h b/include/crypto/rand_pool.h
index d76040924dfa..f37d264f3359 100644
--- a/include/crypto/rand_pool.h
+++ b/include/crypto/rand_pool.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_PROVIDER_RAND_POOL_H
-# define OSSL_PROVIDER_RAND_POOL_H
-# pragma once
+#define OSSL_PROVIDER_RAND_POOL_H
+#pragma once
 
-# include <stdio.h>
-# include <openssl/rand.h>
+#include <stdio.h>
+#include <openssl/rand.h>
 
 /*
  * Maximum allocation size for RANDOM_POOL buffers
@@ -32,9 +32,8 @@
  * The factor 1.5 below is the pessimistic estimate for the extra amount
  * of entropy required when no get_nonce() callback is defined.
  */
-# define RAND_POOL_FACTOR        256
-# define RAND_POOL_MAX_LENGTH    (RAND_POOL_FACTOR * \
-                                  3 * (RAND_DRBG_STRENGTH / 16))
+#define RAND_POOL_FACTOR 256
+#define RAND_POOL_MAX_LENGTH (RAND_POOL_FACTOR * 3 * (RAND_DRBG_STRENGTH / 16))
 /*
  *                             = (RAND_POOL_FACTOR * \
  *                                1.5 * (RAND_DRBG_STRENGTH / 8))
@@ -57,7 +56,7 @@
  * with 40 bytes.  The value of forty eight is comfortably above this which
  * allows some slack in the platform specific values used.
  */
-# define RAND_POOL_MIN_ALLOCATION(secure) ((secure) ? 16 : 48)
+#define RAND_POOL_MIN_ALLOCATION(secure) ((secure) ? 16 : 48)
 
 /*
  * The 'random pool' acts as a dumb container for collecting random
@@ -69,11 +68,11 @@
  * lifetime is intended to be restricted to a single stack frame.
  */
 typedef struct rand_pool_st {
-    unsigned char *buffer;  /* points to the beginning of the random pool */
+    unsigned char *buffer; /* points to the beginning of the random pool */
     size_t len; /* current number of random bytes contained in the pool */
 
-    int attached;  /* true pool was attached to existing buffer */
-    int secure;    /* 1: allocated on the secure heap, 0: otherwise */
+    int attached; /* true pool was attached to existing buffer */
+    int secure; /* 1: allocated on the secure heap, 0: otherwise */
 
     size_t min_len; /* minimum number of random bytes requested */
     size_t max_len; /* maximum number of random bytes (allocated buffer size) */
@@ -83,9 +82,9 @@ typedef struct rand_pool_st {
 } RAND_POOL;
 
 RAND_POOL *ossl_rand_pool_new(int entropy_requested, int secure,
-                              size_t min_len, size_t max_len);
+    size_t min_len, size_t max_len);
 RAND_POOL *ossl_rand_pool_attach(const unsigned char *buffer, size_t len,
-                                 size_t entropy);
+    size_t entropy);
 void ossl_rand_pool_free(RAND_POOL *pool);
 
 const unsigned char *ossl_rand_pool_buffer(RAND_POOL *pool);
@@ -102,10 +101,10 @@ size_t ossl_rand_pool_bytes_needed(RAND_POOL *pool, unsigned int entropy_factor)
 size_t ossl_rand_pool_bytes_remaining(RAND_POOL *pool);
 
 int ossl_rand_pool_add(RAND_POOL *pool,
-                       const unsigned char *buffer, size_t len, size_t entropy);
+    const unsigned char *buffer, size_t len, size_t entropy);
 unsigned char *ossl_rand_pool_add_begin(RAND_POOL *pool, size_t len);
 int ossl_rand_pool_add_end(RAND_POOL *pool, size_t len, size_t entropy);
 int ossl_rand_pool_adin_mix_in(RAND_POOL *pool, const unsigned char *adin,
-                               size_t adin_len);
+    size_t adin_len);
 
 #endif /* OSSL_PROVIDER_RAND_POOL_H */
diff --git a/include/crypto/randerr.h b/include/crypto/randerr.h
index 3a7332673433..b6c91c7f9806 100644
--- a/include/crypto/randerr.h
+++ b/include/crypto/randerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_RANDERR_H
-# define OSSL_CRYPTO_RANDERR_H
-# pragma once
+#define OSSL_CRYPTO_RANDERR_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_RAND_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/riscv_arch.h b/include/crypto/riscv_arch.h
index 1d78eb78f0aa..9894b714d74a 100644
--- a/include/crypto/riscv_arch.h
+++ b/include/crypto/riscv_arch.h
@@ -8,99 +8,103 @@
  */
 
 #ifndef OSSL_CRYPTO_RISCV_ARCH_H
-# define OSSL_CRYPTO_RISCV_ARCH_H
+#define OSSL_CRYPTO_RISCV_ARCH_H
 
-# include <ctype.h>
-# include <stdint.h>
+#include <ctype.h>
+#include <stdint.h>
 
-# if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE)
-#  if __has_include(<asm/hwprobe.h>)
-#   include <sys/syscall.h>
-#   /*
+#if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE)
+#if __has_include(<asm/hwprobe.h>)
+#include <sys/syscall.h>
+#/*
      * Some environments using musl are reported to have the hwprobe.h include
      * file but not have the __NR_riscv_hwprobe define.
      */
-#   ifdef __NR_riscv_hwprobe
-#    define OSSL_RISCV_HWPROBE
-#    include <asm/hwcap.h>
+#ifdef __NR_riscv_hwprobe
+#define OSSL_RISCV_HWPROBE
+#include <asm/hwcap.h>
 extern unsigned int OPENSSL_riscv_hwcap_P;
-#    define VECTOR_CAPABLE (OPENSSL_riscv_hwcap_P & COMPAT_HWCAP_ISA_V)
-#    define ZVX_MIN 15
-#    define ZVX_MAX 23
-#    define IS_IN_DEPEND_VECTOR(offset) ((ZVX_MIN >= offset) && (offset <= ZVX_MAX))
-#   endif
-#  endif
-# endif
+#define VECTOR_CAPABLE (OPENSSL_riscv_hwcap_P & COMPAT_HWCAP_ISA_V)
+#define ZVX_MIN 15
+#define ZVX_MAX 23
+#define IS_IN_DEPEND_VECTOR(offset) ((ZVX_MIN >= offset) && (offset <= ZVX_MAX))
+#endif
+#endif
+#endif
 
-# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
-                          HWPROBE_KEY, HWPROBE_VALUE) +1
-extern uint32_t OPENSSL_riscvcap_P[ ((
-# include "riscv_arch.def"
-) + sizeof(uint32_t) - 1) / sizeof(uint32_t) ];
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
+    HWPROBE_KEY, HWPROBE_VALUE) +1
+extern uint32_t OPENSSL_riscvcap_P[((
+#include "riscv_arch.def"
+                                        )
+                                       + sizeof(uint32_t) - 1)
+    / sizeof(uint32_t)];
 
-# ifdef OPENSSL_RISCVCAP_IMPL
-#  define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
-                           HWPROBE_KEY, HWPROBE_VALUE) +1
-uint32_t OPENSSL_riscvcap_P[ ((
-#  include "riscv_arch.def"
-) + sizeof(uint32_t) - 1) / sizeof(uint32_t) ];
-# endif
+#ifdef OPENSSL_RISCVCAP_IMPL
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
+    HWPROBE_KEY, HWPROBE_VALUE) +1
+uint32_t OPENSSL_riscvcap_P[((
+#include "riscv_arch.def"
+                                 )
+                                + sizeof(uint32_t) - 1)
+    / sizeof(uint32_t)];
+#endif
 
-# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX,                   \
-                          HWPROBE_KEY, HWPROBE_VALUE)               \
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX,                    \
+    HWPROBE_KEY, HWPROBE_VALUE)                                     \
     static inline int RISCV_HAS_##NAME(void)                        \
     {                                                               \
         return (OPENSSL_riscvcap_P[INDEX] & (1 << BIT_INDEX)) != 0; \
     }
-# include "riscv_arch.def"
+#include "riscv_arch.def"
 
 struct RISCV_capability_s {
     const char *name;
     size_t index;
     size_t bit_offset;
-# ifdef OSSL_RISCV_HWPROBE
+#ifdef OSSL_RISCV_HWPROBE
     int32_t hwprobe_key;
     uint64_t hwprobe_value;
-# endif
+#endif
 };
 
-# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
-                          OSSL_RISCV_HWPROBE_KEY, OSSL_RISCV_HWPROBE_VALUE) +1
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
+    OSSL_RISCV_HWPROBE_KEY, OSSL_RISCV_HWPROBE_VALUE) +1
 extern const struct RISCV_capability_s RISCV_capabilities[
-# include "riscv_arch.def"
+#include "riscv_arch.def"
 ];
 
-# ifdef OPENSSL_RISCVCAP_IMPL
-#  ifdef OSSL_RISCV_HWPROBE
-#  define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX,     \
-                           HWPROBE_KEY, HWPROBE_VALUE) \
+#ifdef OPENSSL_RISCVCAP_IMPL
+#ifdef OSSL_RISCV_HWPROBE
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
+    HWPROBE_KEY, HWPROBE_VALUE)                  \
     { #NAME, INDEX, BIT_INDEX, HWPROBE_KEY, HWPROBE_VALUE },
-#  else
-#  define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX,     \
-                           HWPROBE_KEY, HWPROBE_VALUE) \
+#else
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
+    HWPROBE_KEY, HWPROBE_VALUE)                  \
     { #NAME, INDEX, BIT_INDEX },
-#  endif
+#endif
 const struct RISCV_capability_s RISCV_capabilities[] = {
-#  include "riscv_arch.def"
+#include "riscv_arch.def"
 };
-# endif
+#endif
 
-# define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
-                          HWPROBE_KEY, HWPROBE_VALUE) +1
+#define RISCV_DEFINE_CAP(NAME, INDEX, BIT_INDEX, \
+    HWPROBE_KEY, HWPROBE_VALUE) +1
 static const size_t kRISCVNumCaps =
-# include "riscv_arch.def"
-;
+#include "riscv_arch.def"
+    ;
 
-# ifdef OSSL_RISCV_HWPROBE
+#ifdef OSSL_RISCV_HWPROBE
 /*
  * Content is an array of { hwprobe_key, 0 } where
  * hwprobe_key is copied from asm/hwprobe.h.
  * It should be updated along with riscv_arch.def.
  */
-#  define OSSL_RISCV_HWPROBE_PAIR_COUNT 1
-#  define OSSL_RISCV_HWPROBE_PAIR_CONTENT \
-   { 4, 0 },
-# endif
+#define OSSL_RISCV_HWPROBE_PAIR_COUNT 1
+#define OSSL_RISCV_HWPROBE_PAIR_CONTENT \
+    { 4, 0 },
+#endif
 
 /* Extension combination tests. */
 #define RISCV_HAS_ZBB_AND_ZBC() (RISCV_HAS_ZBB() && RISCV_HAS_ZBC())
diff --git a/include/crypto/rsa.h b/include/crypto/rsa.h
index 55cc814ce913..98423bc85fa8 100644
--- a/include/crypto/rsa.h
+++ b/include/crypto/rsa.h
@@ -8,19 +8,19 @@
  */
 
 #ifndef OSSL_INTERNAL_RSA_H
-# define OSSL_INTERNAL_RSA_H
-# pragma once
+#define OSSL_INTERNAL_RSA_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/rsa.h>
-# include "crypto/types.h"
+#include <openssl/core.h>
+#include <openssl/rsa.h>
+#include "crypto/types.h"
 
-#define RSA_MIN_MODULUS_BITS    512
+#define RSA_MIN_MODULUS_BITS 512
 
 typedef struct rsa_pss_params_30_st {
     int hash_algorithm_nid;
     struct {
-        int algorithm_nid;       /* Currently always NID_mgf1 */
+        int algorithm_nid; /* Currently always NID_mgf1 */
         int hash_algorithm_nid;
     } mask_gen;
     int salt_len;
@@ -30,16 +30,16 @@ typedef struct rsa_pss_params_30_st {
 RSA_PSS_PARAMS_30 *ossl_rsa_get0_pss_params_30(RSA *r);
 int ossl_rsa_pss_params_30_set_defaults(RSA_PSS_PARAMS_30 *rsa_pss_params);
 int ossl_rsa_pss_params_30_copy(RSA_PSS_PARAMS_30 *to,
-                                const RSA_PSS_PARAMS_30 *from);
+    const RSA_PSS_PARAMS_30 *from);
 int ossl_rsa_pss_params_30_is_unrestricted(const RSA_PSS_PARAMS_30 *rsa_pss_params);
 int ossl_rsa_pss_params_30_set_hashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                       int hashalg_nid);
+    int hashalg_nid);
 int ossl_rsa_pss_params_30_set_maskgenhashalg(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                              int maskgenhashalg_nid);
+    int maskgenhashalg_nid);
 int ossl_rsa_pss_params_30_set_saltlen(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                       int saltlen);
+    int saltlen);
 int ossl_rsa_pss_params_30_set_trailerfield(RSA_PSS_PARAMS_30 *rsa_pss_params,
-                                            int trailerfield);
+    int trailerfield);
 int ossl_rsa_pss_params_30_hashalg(const RSA_PSS_PARAMS_30 *rsa_pss_params);
 int ossl_rsa_pss_params_30_maskgenalg(const RSA_PSS_PARAMS_30 *rsa_pss_params);
 int ossl_rsa_pss_params_30_maskgenhashalg(const RSA_PSS_PARAMS_30 *rsa_pss_params);
@@ -47,12 +47,12 @@ int ossl_rsa_pss_params_30_saltlen(const RSA_PSS_PARAMS_30 *rsa_pss_params);
 int ossl_rsa_pss_params_30_trailerfield(const RSA_PSS_PARAMS_30 *rsa_pss_params);
 
 int ossl_rsa_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
-                                   const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                                   const unsigned char *EM, int *sLenOut);
+    const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+    const unsigned char *EM, int *sLenOut);
 int ossl_rsa_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
-                                        const unsigned char *mHash,
-                                        const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                                        int *sLenOut);
+    const unsigned char *mHash,
+    const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+    int *sLenOut);
 
 const char *ossl_rsa_mgf_nid2name(int mgf);
 int ossl_rsa_oaeppss_md2nid(const EVP_MD *md);
@@ -63,56 +63,56 @@ OSSL_LIB_CTX *ossl_rsa_get0_libctx(RSA *r);
 void ossl_rsa_set0_libctx(RSA *r, OSSL_LIB_CTX *libctx);
 
 int ossl_rsa_set0_all_params(RSA *r, STACK_OF(BIGNUM) *primes,
-                             STACK_OF(BIGNUM) *exps,
-                             STACK_OF(BIGNUM) *coeffs);
+    STACK_OF(BIGNUM) *exps,
+    STACK_OF(BIGNUM) *coeffs);
 int ossl_rsa_get0_all_params(RSA *r, STACK_OF(BIGNUM_const) *primes,
-                             STACK_OF(BIGNUM_const) *exps,
-                             STACK_OF(BIGNUM_const) *coeffs);
+    STACK_OF(BIGNUM_const) *exps,
+    STACK_OF(BIGNUM_const) *coeffs);
 int ossl_rsa_is_foreign(const RSA *rsa);
 RSA *ossl_rsa_dup(const RSA *rsa, int selection);
 
 int ossl_rsa_todata(RSA *rsa, OSSL_PARAM_BLD *bld, OSSL_PARAM params[],
-                    int include_private);
+    int include_private);
 int ossl_rsa_fromdata(RSA *rsa, const OSSL_PARAM params[], int include_private);
 int ossl_rsa_pss_params_30_todata(const RSA_PSS_PARAMS_30 *pss,
-                                  OSSL_PARAM_BLD *bld, OSSL_PARAM params[]);
+    OSSL_PARAM_BLD *bld, OSSL_PARAM params[]);
 int ossl_rsa_pss_params_30_fromdata(RSA_PSS_PARAMS_30 *pss_params,
-                                    int *defaults_set,
-                                    const OSSL_PARAM params[],
-                                    OSSL_LIB_CTX *libctx);
+    int *defaults_set,
+    const OSSL_PARAM params[],
+    OSSL_LIB_CTX *libctx);
 int ossl_rsa_set0_pss_params(RSA *r, RSA_PSS_PARAMS *pss);
 int ossl_rsa_pss_get_param_unverified(const RSA_PSS_PARAMS *pss,
-                                      const EVP_MD **pmd, const EVP_MD **pmgf1md,
-                                      int *psaltlen, int *ptrailerField);
+    const EVP_MD **pmd, const EVP_MD **pmgf1md,
+    int *psaltlen, int *ptrailerField);
 RSA_PSS_PARAMS *ossl_rsa_pss_decode(const X509_ALGOR *alg);
 int ossl_rsa_param_decode(RSA *rsa, const X509_ALGOR *alg);
 RSA *ossl_rsa_key_from_pkcs8(const PKCS8_PRIV_KEY_INFO *p8inf,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_rsa_padding_check_PKCS1_type_2(OSSL_LIB_CTX *ctx,
-                                        unsigned char *to, int tlen,
-                                        const unsigned char *from, int flen,
-                                        int num, unsigned char *kdk);
+    unsigned char *to, int tlen,
+    const unsigned char *from, int flen,
+    int num, unsigned char *kdk);
 int ossl_rsa_padding_check_PKCS1_type_2_TLS(OSSL_LIB_CTX *ctx, unsigned char *to,
-                                            size_t tlen,
-                                            const unsigned char *from,
-                                            size_t flen, int client_version,
-                                            int alt_version);
+    size_t tlen,
+    const unsigned char *from,
+    size_t flen, int client_version,
+    int alt_version);
 int ossl_rsa_padding_add_PKCS1_OAEP_mgf1_ex(OSSL_LIB_CTX *libctx,
-                                            unsigned char *to, int tlen,
-                                            const unsigned char *from, int flen,
-                                            const unsigned char *param,
-                                            int plen, const EVP_MD *md,
-                                            const EVP_MD *mgf1md);
+    unsigned char *to, int tlen,
+    const unsigned char *from, int flen,
+    const unsigned char *param,
+    int plen, const EVP_MD *md,
+    const EVP_MD *mgf1md);
 
 int ossl_rsa_validate_public(const RSA *key);
 int ossl_rsa_validate_private(const RSA *key);
 int ossl_rsa_validate_pairwise(const RSA *key);
 
 int ossl_rsa_verify(int dtype, const unsigned char *m,
-                    unsigned int m_len, unsigned char *rm,
-                    size_t *prm_len, const unsigned char *sigbuf,
-                    size_t siglen, RSA *rsa);
+    unsigned int m_len, unsigned char *rm,
+    size_t *prm_len, const unsigned char *sigbuf,
+    size_t siglen, RSA *rsa);
 
 const unsigned char *ossl_rsa_digestinfo_encoding(int md_nid, size_t *len);
 
@@ -122,9 +122,9 @@ extern const char *ossl_rsa_mp_coeff_names[];
 
 ASN1_STRING *ossl_rsa_ctx_to_pss_string(EVP_PKEY_CTX *pkctx);
 int ossl_rsa_pss_to_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pkctx,
-                        const X509_ALGOR *sigalg, EVP_PKEY *pkey);
+    const X509_ALGOR *sigalg, EVP_PKEY *pkey);
 
-# if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS)
+#if defined(FIPS_MODULE) && !defined(OPENSSL_NO_ACVP_TESTS)
 int ossl_rsa_acvp_test_gen_params_new(OSSL_PARAM **dst, const OSSL_PARAM src[]);
 void ossl_rsa_acvp_test_gen_params_free(OSSL_PARAM *dst);
 
@@ -132,9 +132,9 @@ int ossl_rsa_acvp_test_set_params(RSA *r, const OSSL_PARAM params[]);
 int ossl_rsa_acvp_test_get_params(RSA *r, OSSL_PARAM params[]);
 typedef struct rsa_acvp_test_st RSA_ACVP_TEST;
 void ossl_rsa_acvp_test_free(RSA_ACVP_TEST *t);
-# else
-# define RSA_ACVP_TEST void
-# endif
+#else
+#define RSA_ACVP_TEST void
+#endif
 int ossl_rsa_check_factors(RSA *r);
 
 RSA *evp_pkey_get1_RSA_PSS(EVP_PKEY *pkey);
diff --git a/include/crypto/rsaerr.h b/include/crypto/rsaerr.h
index 9b23500b3708..d295eef80d23 100644
--- a/include/crypto/rsaerr.h
+++ b/include/crypto/rsaerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_RSAERR_H
-# define OSSL_CRYPTO_RSAERR_H
-# pragma once
+#define OSSL_CRYPTO_RSAERR_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_RSA_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/security_bits.h b/include/crypto/security_bits.h
index 58f49681dc63..56fe8d2573d4 100644
--- a/include/crypto/security_bits.h
+++ b/include/crypto/security_bits.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_SECURITY_BITS_H
-# define OSSL_SECURITY_BITS_H
-# pragma once
+#define OSSL_SECURITY_BITS_H
+#pragma once
 
 uint16_t ossl_ifc_ffc_compute_security_bits(int n);
 
diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index 99bcf0ff8835..fed23f1a667b 100644
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -9,10 +9,10 @@
  */
 
 #ifndef OSSL_CRYPTO_SHA_H
-# define OSSL_CRYPTO_SHA_H
-# pragma once
+#define OSSL_CRYPTO_SHA_H
+#pragma once
 
-# include <openssl/sha.h>
+#include <openssl/sha.h>
 
 int ossl_sha256_192_init(SHA256_CTX *c);
 int sha512_224_init(SHA512_CTX *);
diff --git a/include/crypto/siphash.h b/include/crypto/siphash.h
index 0d0767fcf481..3ffdc055e695 100644
--- a/include/crypto/siphash.h
+++ b/include/crypto/siphash.h
@@ -8,15 +8,15 @@
  */
 
 #ifndef OSSL_CRYPTO_SIPHASH_H
-# define OSSL_CRYPTO_SIPHASH_H
-# pragma once
+#define OSSL_CRYPTO_SIPHASH_H
+#pragma once
 
-# include <stddef.h>
+#include <stddef.h>
 
-# define SIPHASH_BLOCK_SIZE        8
-# define SIPHASH_KEY_SIZE         16
-# define SIPHASH_MIN_DIGEST_SIZE   8
-# define SIPHASH_MAX_DIGEST_SIZE  16
+#define SIPHASH_BLOCK_SIZE 8
+#define SIPHASH_KEY_SIZE 16
+#define SIPHASH_MIN_DIGEST_SIZE 8
+#define SIPHASH_MAX_DIGEST_SIZE 16
 
 typedef struct siphash_st SIPHASH;
 
@@ -24,7 +24,7 @@ size_t SipHash_ctx_size(void);
 size_t SipHash_hash_size(SIPHASH *ctx);
 int SipHash_set_hash_size(SIPHASH *ctx, size_t hash_size);
 int SipHash_Init(SIPHASH *ctx, const unsigned char *k,
-                 int crounds, int drounds);
+    int crounds, int drounds);
 void SipHash_Update(SIPHASH *ctx, const unsigned char *in, size_t inlen);
 int SipHash_Final(SIPHASH *ctx, unsigned char *out, size_t outlen);
 
@@ -44,7 +44,7 @@ struct siphash_st {
 };
 
 /* default: SipHash-2-4 */
-# define SIPHASH_C_ROUNDS 2
-# define SIPHASH_D_ROUNDS 4
+#define SIPHASH_C_ROUNDS 2
+#define SIPHASH_D_ROUNDS 4
 
 #endif
diff --git a/include/crypto/siv.h b/include/crypto/siv.h
index 8dc58bd32106..b4f04a80c8a5 100644
--- a/include/crypto/siv.h
+++ b/include/crypto/siv.h
@@ -12,20 +12,20 @@
 typedef struct siv128_context SIV128_CONTEXT;
 
 SIV128_CONTEXT *ossl_siv128_new(const unsigned char *key, int klen,
-                                EVP_CIPHER *cbc, EVP_CIPHER *ctr,
-                                OSSL_LIB_CTX *libctx, const char *propq);
+    EVP_CIPHER *cbc, EVP_CIPHER *ctr,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int ossl_siv128_init(SIV128_CONTEXT *ctx, const unsigned char *key, int klen,
-                     const EVP_CIPHER *cbc, const EVP_CIPHER *ctr,
-                     OSSL_LIB_CTX *libctx, const char *propq);
+    const EVP_CIPHER *cbc, const EVP_CIPHER *ctr,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int ossl_siv128_copy_ctx(SIV128_CONTEXT *dest, SIV128_CONTEXT *src);
 int ossl_siv128_aad(SIV128_CONTEXT *ctx, const unsigned char *aad, size_t len);
 int ossl_siv128_encrypt(SIV128_CONTEXT *ctx,
-                        const unsigned char *in, unsigned char *out, size_t len);
+    const unsigned char *in, unsigned char *out, size_t len);
 int ossl_siv128_decrypt(SIV128_CONTEXT *ctx,
-                        const unsigned char *in, unsigned char *out, size_t len);
+    const unsigned char *in, unsigned char *out, size_t len);
 int ossl_siv128_finish(SIV128_CONTEXT *ctx);
 int ossl_siv128_set_tag(SIV128_CONTEXT *ctx, const unsigned char *tag,
-                        size_t len);
+    size_t len);
 int ossl_siv128_get_tag(SIV128_CONTEXT *ctx, unsigned char *tag, size_t len);
 int ossl_siv128_cleanup(SIV128_CONTEXT *ctx);
 int ossl_siv128_speed(SIV128_CONTEXT *ctx, int arg);
diff --git a/include/crypto/slh_dsa.h b/include/crypto/slh_dsa.h
index 75b928638309..b823a312b04c 100644
--- a/include/crypto/slh_dsa.h
+++ b/include/crypto/slh_dsa.h
@@ -10,42 +10,42 @@
 /* Internal SLH_DSA functions for other submodules, not for application use */
 
 #ifndef OSSL_CRYPTO_SLH_DSA_H
-# define OSSL_CRYPTO_SLH_DSA_H
+#define OSSL_CRYPTO_SLH_DSA_H
 
-# pragma once
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include "crypto/types.h"
+#pragma once
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include "crypto/types.h"
 
-# define SLH_DSA_MAX_CONTEXT_STRING_LEN 255
-# define SLH_DSA_MAX_N                  32
+#define SLH_DSA_MAX_CONTEXT_STRING_LEN 255
+#define SLH_DSA_MAX_N 32
 
 typedef struct slh_dsa_hash_ctx_st SLH_DSA_HASH_CTX;
 typedef struct slh_dsa_key_st SLH_DSA_KEY;
 
 __owur OSSL_LIB_CTX *ossl_slh_dsa_key_get0_libctx(const SLH_DSA_KEY *key);
 __owur SLH_DSA_KEY *ossl_slh_dsa_key_new(OSSL_LIB_CTX *libctx, const char *propq,
-                                         const char *alg);
+    const char *alg);
 void ossl_slh_dsa_key_free(SLH_DSA_KEY *key);
 void ossl_slh_dsa_key_reset(SLH_DSA_KEY *key);
 __owur SLH_DSA_KEY *ossl_slh_dsa_key_dup(const SLH_DSA_KEY *src, int selection);
 __owur int ossl_slh_dsa_key_equal(const SLH_DSA_KEY *key1, const SLH_DSA_KEY *key2,
-                                  int selection);
+    int selection);
 __owur int ossl_slh_dsa_key_has(const SLH_DSA_KEY *key, int selection);
 __owur int ossl_slh_dsa_key_pairwise_check(const SLH_DSA_KEY *key);
 __owur int ossl_slh_dsa_key_fromdata(SLH_DSA_KEY *key, const OSSL_PARAM *params,
-                                     int include_private);
+    int include_private);
 __owur int ossl_slh_dsa_generate_key(SLH_DSA_HASH_CTX *ctx, SLH_DSA_KEY *out,
-                                     OSSL_LIB_CTX *libctx,
-                                     const uint8_t *entropy, size_t entropy_len);
+    OSSL_LIB_CTX *libctx,
+    const uint8_t *entropy, size_t entropy_len);
 __owur int ossl_slh_dsa_key_to_text(BIO *out, const SLH_DSA_KEY *key, int selection);
 __owur const uint8_t *ossl_slh_dsa_key_get_pub(const SLH_DSA_KEY *key);
 __owur const uint8_t *ossl_slh_dsa_key_get_priv(const SLH_DSA_KEY *key);
 __owur size_t ossl_slh_dsa_key_get_pub_len(const SLH_DSA_KEY *key);
 __owur int ossl_slh_dsa_set_priv(SLH_DSA_KEY *key, const uint8_t *priv,
-                                 size_t priv_len);
+    size_t priv_len);
 __owur int ossl_slh_dsa_set_pub(SLH_DSA_KEY *key, const uint8_t *pub,
-                                size_t pub_len);
+    size_t pub_len);
 __owur size_t ossl_slh_dsa_key_get_priv_len(const SLH_DSA_KEY *key);
 __owur size_t ossl_slh_dsa_key_get_n(const SLH_DSA_KEY *key);
 __owur size_t ossl_slh_dsa_key_get_sig_len(const SLH_DSA_KEY *key);
@@ -57,13 +57,13 @@ void ossl_slh_dsa_hash_ctx_free(SLH_DSA_HASH_CTX *ctx);
 __owur SLH_DSA_HASH_CTX *ossl_slh_dsa_hash_ctx_dup(const SLH_DSA_HASH_CTX *src);
 
 __owur int ossl_slh_dsa_sign(SLH_DSA_HASH_CTX *slh_ctx,
-                             const uint8_t *msg, size_t msg_len,
-                             const uint8_t *ctx, size_t ctx_len,
-                             const uint8_t *add_rand, int encode,
-                             unsigned char *sig, size_t *siglen, size_t sigsize);
+    const uint8_t *msg, size_t msg_len,
+    const uint8_t *ctx, size_t ctx_len,
+    const uint8_t *add_rand, int encode,
+    unsigned char *sig, size_t *siglen, size_t sigsize);
 __owur int ossl_slh_dsa_verify(SLH_DSA_HASH_CTX *slh_ctx,
-                               const uint8_t *msg, size_t msg_len,
-                               const uint8_t *ctx, size_t ctx_len, int encode,
-                               const uint8_t *sig, size_t sig_len);
+    const uint8_t *msg, size_t msg_len,
+    const uint8_t *ctx, size_t ctx_len, int encode,
+    const uint8_t *sig, size_t sig_len);
 
 #endif /* OSSL_CRYPTO_SLH_DSA_H */
diff --git a/include/crypto/sm2.h b/include/crypto/sm2.h
index 9ab6c0b72236..246d644c2797 100644
--- a/include/crypto/sm2.h
+++ b/include/crypto/sm2.h
@@ -10,77 +10,77 @@
  */
 
 #ifndef OSSL_CRYPTO_SM2_H
-# define OSSL_CRYPTO_SM2_H
-# pragma once
+#define OSSL_CRYPTO_SM2_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# if !defined(OPENSSL_NO_SM2) && !defined(FIPS_MODULE)
+#if !defined(OPENSSL_NO_SM2) && !defined(FIPS_MODULE)
 
-#  include <openssl/ec.h>
-#  include "crypto/types.h"
+#include <openssl/ec.h>
+#include "crypto/types.h"
 
 int ossl_sm2_key_private_check(const EC_KEY *eckey);
 
 /* The default user id as specified in GM/T 0009-2012 */
-#  define SM2_DEFAULT_USERID "1234567812345678"
+#define SM2_DEFAULT_USERID "1234567812345678"
 
 int ossl_sm2_compute_z_digest(uint8_t *out,
-                              const EVP_MD *digest,
-                              const uint8_t *id,
-                              const size_t id_len,
-                              const EC_KEY *key);
+    const EVP_MD *digest,
+    const uint8_t *id,
+    const size_t id_len,
+    const EC_KEY *key);
 
 /*
  * SM2 signature operation. Computes Z and then signs H(Z || msg) using SM2
  */
 ECDSA_SIG *ossl_sm2_do_sign(const EC_KEY *key,
-                            const EVP_MD *digest,
-                            const uint8_t *id,
-                            const size_t id_len,
-                            const uint8_t *msg, size_t msg_len);
+    const EVP_MD *digest,
+    const uint8_t *id,
+    const size_t id_len,
+    const uint8_t *msg, size_t msg_len);
 
 int ossl_sm2_do_verify(const EC_KEY *key,
-                       const EVP_MD *digest,
-                       const ECDSA_SIG *signature,
-                       const uint8_t *id,
-                       const size_t id_len,
-                       const uint8_t *msg, size_t msg_len);
+    const EVP_MD *digest,
+    const ECDSA_SIG *signature,
+    const uint8_t *id,
+    const size_t id_len,
+    const uint8_t *msg, size_t msg_len);
 
 /*
  * SM2 signature generation.
  */
 int ossl_sm2_internal_sign(const unsigned char *dgst, int dgstlen,
-                           unsigned char *sig, unsigned int *siglen,
-                           EC_KEY *eckey);
+    unsigned char *sig, unsigned int *siglen,
+    EC_KEY *eckey);
 
 /*
  * SM2 signature verification.
  */
 int ossl_sm2_internal_verify(const unsigned char *dgst, int dgstlen,
-                             const unsigned char *sig, int siglen,
-                             EC_KEY *eckey);
+    const unsigned char *sig, int siglen,
+    EC_KEY *eckey);
 
 /*
  * SM2 encryption
  */
 int ossl_sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest,
-                             size_t msg_len, size_t *ct_size);
+    size_t msg_len, size_t *ct_size);
 
 int ossl_sm2_plaintext_size(const unsigned char *ct, size_t ct_size,
-                            size_t *pt_size);
+    size_t *pt_size);
 
 int ossl_sm2_encrypt(const EC_KEY *key,
-                     const EVP_MD *digest,
-                     const uint8_t *msg, size_t msg_len,
-                     uint8_t *ciphertext_buf, size_t *ciphertext_len);
+    const EVP_MD *digest,
+    const uint8_t *msg, size_t msg_len,
+    uint8_t *ciphertext_buf, size_t *ciphertext_len);
 
 int ossl_sm2_decrypt(const EC_KEY *key,
-                     const EVP_MD *digest,
-                     const uint8_t *ciphertext, size_t ciphertext_len,
-                     uint8_t *ptext_buf, size_t *ptext_len);
+    const EVP_MD *digest,
+    const uint8_t *ciphertext, size_t ciphertext_len,
+    uint8_t *ptext_buf, size_t *ptext_len);
 
 const unsigned char *ossl_sm2_algorithmidentifier_encoding(int md_nid,
-                                                           size_t *len);
-# endif /* OPENSSL_NO_SM2 */
+    size_t *len);
+#endif /* OPENSSL_NO_SM2 */
 #endif
diff --git a/include/crypto/sm2err.h b/include/crypto/sm2err.h
index 706f4d69dec2..3dc4f7d93a10 100644
--- a/include/crypto/sm2err.h
+++ b/include/crypto/sm2err.h
@@ -9,41 +9,41 @@
  */
 
 #ifndef OSSL_CRYPTO_SM2ERR_H
-# define OSSL_CRYPTO_SM2ERR_H
-# pragma once
+#define OSSL_CRYPTO_SM2ERR_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
 
-# ifndef OPENSSL_NO_SM2
+#ifndef OPENSSL_NO_SM2
 
 int ossl_err_load_SM2_strings(void);
 
 /*
  * SM2 reason codes.
  */
-#  define SM2_R_ASN1_ERROR                                 100
-#  define SM2_R_BAD_SIGNATURE                              101
-#  define SM2_R_BUFFER_TOO_SMALL                           107
-#  define SM2_R_DIST_ID_TOO_LARGE                          110
-#  define SM2_R_ID_NOT_SET                                 112
-#  define SM2_R_ID_TOO_LARGE                               111
-#  define SM2_R_INVALID_CURVE                              108
-#  define SM2_R_INVALID_DIGEST                             102
-#  define SM2_R_INVALID_DIGEST_TYPE                        103
-#  define SM2_R_INVALID_ENCODING                           104
-#  define SM2_R_INVALID_FIELD                              105
-#  define SM2_R_INVALID_PRIVATE_KEY                        113
-#  define SM2_R_NO_PARAMETERS_SET                          109
-#  define SM2_R_USER_ID_TOO_LARGE                          106
+#define SM2_R_ASN1_ERROR 100
+#define SM2_R_BAD_SIGNATURE 101
+#define SM2_R_BUFFER_TOO_SMALL 107
+#define SM2_R_DIST_ID_TOO_LARGE 110
+#define SM2_R_ID_NOT_SET 112
+#define SM2_R_ID_TOO_LARGE 111
+#define SM2_R_INVALID_CURVE 108
+#define SM2_R_INVALID_DIGEST 102
+#define SM2_R_INVALID_DIGEST_TYPE 103
+#define SM2_R_INVALID_ENCODING 104
+#define SM2_R_INVALID_FIELD 105
+#define SM2_R_INVALID_PRIVATE_KEY 113
+#define SM2_R_NO_PARAMETERS_SET 109
+#define SM2_R_USER_ID_TOO_LARGE 106
 
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h
index e21ec81ca6a8..d97e3f55dec3 100644
--- a/include/crypto/sm4.h
+++ b/include/crypto/sm4.h
@@ -9,21 +9,21 @@
  */
 
 #ifndef OSSL_CRYPTO_SM4_H
-# define OSSL_CRYPTO_SM4_H
-# pragma once
+#define OSSL_CRYPTO_SM4_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/e_os2.h>
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 
-# ifdef OPENSSL_NO_SM4
-#  error SM4 is disabled.
-# endif
+#ifdef OPENSSL_NO_SM4
+#error SM4 is disabled.
+#endif
 
-# define SM4_ENCRYPT     1
-# define SM4_DECRYPT     0
+#define SM4_ENCRYPT 1
+#define SM4_DECRYPT 0
 
-# define SM4_BLOCK_SIZE    16
-# define SM4_KEY_SCHEDULE  32
+#define SM4_BLOCK_SIZE 16
+#define SM4_KEY_SCHEDULE 32
 
 typedef struct SM4_KEY_st {
     uint32_t rk[SM4_KEY_SCHEDULE];
diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h
index 3df1b4256de7..e6f663ef55de 100644
--- a/include/crypto/sm4_platform.h
+++ b/include/crypto/sm4_platform.h
@@ -8,116 +8,113 @@
  */
 
 #ifndef OSSL_SM4_PLATFORM_H
-# define OSSL_SM4_PLATFORM_H
-# pragma once
+#define OSSL_SM4_PLATFORM_H
+#pragma once
 
-# if defined(OPENSSL_CPUID_OBJ)
-#  if defined(__aarch64__) ||  defined (_M_ARM64)
-#   include "arm_arch.h"
+#if defined(OPENSSL_CPUID_OBJ)
+#if defined(__aarch64__) || defined(_M_ARM64)
+#include "arm_arch.h"
 extern unsigned int OPENSSL_arm_midr;
 static inline int vpsm4_capable(void)
 {
-    return (OPENSSL_armcap_P & ARMV8_CPUID) &&
-            (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) ||
-             MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1));
+    return (OPENSSL_armcap_P & ARMV8_CPUID) && (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_V1) || MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, ARM_CPU_IMP_ARM, ARM_CPU_PART_N1));
 }
 static inline int vpsm4_ex_capable(void)
 {
-    return (OPENSSL_armcap_P & ARMV8_CPUID) &&
-            (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, HISI_CPU_IMP, HISI_CPU_PART_KP920));
+    return (OPENSSL_armcap_P & ARMV8_CPUID) && (MIDR_IS_CPU_MODEL(OPENSSL_arm_midr, HISI_CPU_IMP, HISI_CPU_PART_KP920));
 }
-#   if defined(VPSM4_ASM)
-#    define VPSM4_CAPABLE vpsm4_capable()
-#    define VPSM4_EX_CAPABLE vpsm4_ex_capable()
-#   endif
-#   define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4)
-#   define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key
-#   define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key
-#   define HWSM4_encrypt sm4_v8_encrypt
-#   define HWSM4_decrypt sm4_v8_decrypt
-#   define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt
-#   define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt
-#   define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks
-#  elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
+#if defined(VPSM4_ASM)
+#define VPSM4_CAPABLE vpsm4_capable()
+#define VPSM4_EX_CAPABLE vpsm4_ex_capable()
+#endif
+#define HWSM4_CAPABLE (OPENSSL_armcap_P & ARMV8_SM4)
+#define HWSM4_set_encrypt_key sm4_v8_set_encrypt_key
+#define HWSM4_set_decrypt_key sm4_v8_set_decrypt_key
+#define HWSM4_encrypt sm4_v8_encrypt
+#define HWSM4_decrypt sm4_v8_decrypt
+#define HWSM4_cbc_encrypt sm4_v8_cbc_encrypt
+#define HWSM4_ecb_encrypt sm4_v8_ecb_encrypt
+#define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks
+#elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
 /* RV64 support */
-#   include "riscv_arch.h"
+#include "riscv_arch.h"
 /* Zvksed extension (vector crypto SM4). */
 int rv64i_zvksed_sm4_set_encrypt_key(const unsigned char *userKey,
-                                     SM4_KEY *key);
+    SM4_KEY *key);
 int rv64i_zvksed_sm4_set_decrypt_key(const unsigned char *userKey,
-                                     SM4_KEY *key);
+    SM4_KEY *key);
 void rv64i_zvksed_sm4_encrypt(const unsigned char *in, unsigned char *out,
-                              const SM4_KEY *key);
+    const SM4_KEY *key);
 void rv64i_zvksed_sm4_decrypt(const unsigned char *in, unsigned char *out,
-                              const SM4_KEY *key);
-#  endif /* RV64 */
-# endif /* OPENSSL_CPUID_OBJ */
+    const SM4_KEY *key);
+#endif /* RV64 */
+#endif /* OPENSSL_CPUID_OBJ */
 
-# if defined(HWSM4_CAPABLE)
+#if defined(HWSM4_CAPABLE)
 int HWSM4_set_encrypt_key(const unsigned char *userKey, SM4_KEY *key);
 int HWSM4_set_decrypt_key(const unsigned char *userKey, SM4_KEY *key);
 void HWSM4_encrypt(const unsigned char *in, unsigned char *out,
-                   const SM4_KEY *key);
+    const SM4_KEY *key);
 void HWSM4_decrypt(const unsigned char *in, unsigned char *out,
-                   const SM4_KEY *key);
+    const SM4_KEY *key);
 void HWSM4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const SM4_KEY *key,
-                       unsigned char *ivec, const int enc);
+    size_t length, const SM4_KEY *key,
+    unsigned char *ivec, const int enc);
 void HWSM4_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const SM4_KEY *key,
-                       const int enc);
+    size_t length, const SM4_KEY *key,
+    const int enc);
 void HWSM4_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
-                                size_t len, const void *key,
-                                const unsigned char ivec[16]);
-# endif /* HWSM4_CAPABLE */
+    size_t len, const void *key,
+    const unsigned char ivec[16]);
+#endif /* HWSM4_CAPABLE */
 
-# ifdef VPSM4_CAPABLE
+#ifdef VPSM4_CAPABLE
 int vpsm4_set_encrypt_key(const unsigned char *userKey, SM4_KEY *key);
 int vpsm4_set_decrypt_key(const unsigned char *userKey, SM4_KEY *key);
 void vpsm4_encrypt(const unsigned char *in, unsigned char *out,
-                   const SM4_KEY *key);
+    const SM4_KEY *key);
 void vpsm4_decrypt(const unsigned char *in, unsigned char *out,
-                   const SM4_KEY *key);
+    const SM4_KEY *key);
 void vpsm4_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const SM4_KEY *key,
-                       unsigned char *ivec, const int enc);
+    size_t length, const SM4_KEY *key,
+    unsigned char *ivec, const int enc);
 void vpsm4_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const SM4_KEY *key,
-                       const int enc);
+    size_t length, const SM4_KEY *key,
+    const int enc);
 void vpsm4_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
-                                size_t len, const void *key,
-                                const unsigned char ivec[16]);
+    size_t len, const void *key,
+    const unsigned char ivec[16]);
 void vpsm4_xts_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t len, const SM4_KEY *key1, const SM4_KEY *key2,
-                       const unsigned char ivec[16], const int enc);
+    size_t len, const SM4_KEY *key1, const SM4_KEY *key2,
+    const unsigned char ivec[16], const int enc);
 void vpsm4_xts_encrypt_gb(const unsigned char *in, unsigned char *out,
-                          size_t len, const SM4_KEY *key1, const SM4_KEY *key2,
-                          const unsigned char ivec[16], const int enc);
-# endif /* VPSM4_CAPABLE */
+    size_t len, const SM4_KEY *key1, const SM4_KEY *key2,
+    const unsigned char ivec[16], const int enc);
+#endif /* VPSM4_CAPABLE */
 
-# ifdef VPSM4_EX_CAPABLE
+#ifdef VPSM4_EX_CAPABLE
 int vpsm4_ex_set_encrypt_key(const unsigned char *userKey, SM4_KEY *key);
 int vpsm4_ex_set_decrypt_key(const unsigned char *userKey, SM4_KEY *key);
 void vpsm4_ex_encrypt(const unsigned char *in, unsigned char *out,
-                      const SM4_KEY *key);
+    const SM4_KEY *key);
 void vpsm4_ex_decrypt(const unsigned char *in, unsigned char *out,
-                      const SM4_KEY *key);
+    const SM4_KEY *key);
 void vpsm4_ex_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t length, const SM4_KEY *key,
-                          unsigned char *ivec, const int enc);
+    size_t length, const SM4_KEY *key,
+    unsigned char *ivec, const int enc);
 void vpsm4_ex_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t length, const SM4_KEY *key,
-                          const int enc);
+    size_t length, const SM4_KEY *key,
+    const int enc);
 void vpsm4_ex_ctr32_encrypt_blocks(const unsigned char *in, unsigned char *out,
-                                   size_t len, const void *key,
-                                   const unsigned char ivec[16]);
+    size_t len, const void *key,
+    const unsigned char ivec[16]);
 void vpsm4_ex_xts_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t len, const SM4_KEY *key1, const SM4_KEY *key2,
-                          const unsigned char ivec[16], const int enc);
+    size_t len, const SM4_KEY *key1, const SM4_KEY *key2,
+    const unsigned char ivec[16], const int enc);
 void vpsm4_ex_xts_encrypt_gb(const unsigned char *in, unsigned char *out,
-                             size_t len, const SM4_KEY *key1,
-                             const SM4_KEY *key2, const unsigned char ivec[16],
-                             const int enc);
-# endif /* VPSM4_EX_CAPABLE */
+    size_t len, const SM4_KEY *key1,
+    const SM4_KEY *key2, const unsigned char ivec[16],
+    const int enc);
+#endif /* VPSM4_EX_CAPABLE */
 
 #endif /* OSSL_SM4_PLATFORM_H */
diff --git a/include/crypto/sparc_arch.h b/include/crypto/sparc_arch.h
index 447e715bf205..8e72c3504f7a 100644
--- a/include/crypto/sparc_arch.h
+++ b/include/crypto/sparc_arch.h
@@ -8,52 +8,53 @@
  */
 
 #ifndef OSSL_CRYPTO_SPARC_ARCH_H
-# define OSSL_CRYPTO_SPARC_ARCH_H
+#define OSSL_CRYPTO_SPARC_ARCH_H
 
-# define SPARCV9_TICK_PRIVILEGED (1<<0)
-# define SPARCV9_PREFER_FPU      (1<<1)
-# define SPARCV9_VIS1            (1<<2)
-# define SPARCV9_VIS2            (1<<3)/* reserved */
-# define SPARCV9_FMADD           (1<<4)
-# define SPARCV9_BLK             (1<<5)/* VIS1 block copy */
-# define SPARCV9_VIS3            (1<<6)
-# define SPARCV9_RANDOM          (1<<7)
-# define SPARCV9_64BIT_STACK     (1<<8)
-# define SPARCV9_FJAESX          (1<<9)/* Fujitsu SPARC64 X AES */
-# define SPARCV9_FJDESX          (1<<10)/* Fujitsu SPARC64 X DES, reserved */
-# define SPARCV9_FJHPCACE        (1<<11)/* Fujitsu HPC-ACE, reserved */
-# define SPARCV9_IMA             (1<<13)/* reserved */
-# define SPARCV9_VIS4            (1<<14)/* reserved */
+#define SPARCV9_TICK_PRIVILEGED (1 << 0)
+#define SPARCV9_PREFER_FPU (1 << 1)
+#define SPARCV9_VIS1 (1 << 2)
+#define SPARCV9_VIS2 (1 << 3) /* reserved */
+#define SPARCV9_FMADD (1 << 4)
+#define SPARCV9_BLK (1 << 5) /* VIS1 block copy */
+#define SPARCV9_VIS3 (1 << 6)
+#define SPARCV9_RANDOM (1 << 7)
+#define SPARCV9_64BIT_STACK (1 << 8)
+#define SPARCV9_FJAESX (1 << 9) /* Fujitsu SPARC64 X AES */
+#define SPARCV9_FJDESX (1 << 10) /* Fujitsu SPARC64 X DES, reserved */
+#define SPARCV9_FJHPCACE (1 << 11) /* Fujitsu HPC-ACE, reserved */
+#define SPARCV9_IMA (1 << 13) /* reserved */
+#define SPARCV9_VIS4 (1 << 14) /* reserved */
 
 /*
  * OPENSSL_sparcv9cap_P[1] is copy of Compatibility Feature Register,
  * %asr26, SPARC-T4 and later. There is no SPARCV9_CFR bit in
  * OPENSSL_sparcv9cap_P[0], as %cfr copy is sufficient...
  */
-# define CFR_AES         0x00000001/* Supports AES opcodes */
-# define CFR_DES         0x00000002/* Supports DES opcodes */
-# define CFR_KASUMI      0x00000004/* Supports KASUMI opcodes */
-# define CFR_CAMELLIA    0x00000008/* Supports CAMELLIA opcodes */
-# define CFR_MD5         0x00000010/* Supports MD5 opcodes */
-# define CFR_SHA1        0x00000020/* Supports SHA1 opcodes */
-# define CFR_SHA256      0x00000040/* Supports SHA256 opcodes */
-# define CFR_SHA512      0x00000080/* Supports SHA512 opcodes */
-# define CFR_MPMUL       0x00000100/* Supports MPMUL opcodes */
-# define CFR_MONTMUL     0x00000200/* Supports MONTMUL opcodes */
-# define CFR_MONTSQR     0x00000400/* Supports MONTSQR opcodes */
-# define CFR_CRC32C      0x00000800/* Supports CRC32C opcodes */
-# define CFR_XMPMUL      0x00001000/* Supports XMPMUL opcodes */
-# define CFR_XMONTMUL    0x00002000/* Supports XMONTMUL opcodes */
-# define CFR_XMONTSQR    0x00004000/* Supports XMONTSQR opcodes */
+#define CFR_AES 0x00000001 /* Supports AES opcodes */
+#define CFR_DES 0x00000002 /* Supports DES opcodes */
+#define CFR_KASUMI 0x00000004 /* Supports KASUMI opcodes */
+#define CFR_CAMELLIA 0x00000008 /* Supports CAMELLIA opcodes */
+#define CFR_MD5 0x00000010 /* Supports MD5 opcodes */
+#define CFR_SHA1 0x00000020 /* Supports SHA1 opcodes */
+#define CFR_SHA256 0x00000040 /* Supports SHA256 opcodes */
+#define CFR_SHA512 0x00000080 /* Supports SHA512 opcodes */
+#define CFR_MPMUL 0x00000100 /* Supports MPMUL opcodes */
+#define CFR_MONTMUL 0x00000200 /* Supports MONTMUL opcodes */
+#define CFR_MONTSQR 0x00000400 /* Supports MONTSQR opcodes */
+#define CFR_CRC32C 0x00000800 /* Supports CRC32C opcodes */
+#define CFR_XMPMUL 0x00001000 /* Supports XMPMUL opcodes */
+#define CFR_XMONTMUL 0x00002000 /* Supports XMONTMUL opcodes */
+#define CFR_XMONTSQR 0x00004000 /* Supports XMONTSQR opcodes */
 
-# if defined(OPENSSL_PIC) && !defined(__PIC__)
-#  define __PIC__
-# endif
+#if defined(OPENSSL_PIC) && !defined(__PIC__)
+#define __PIC__
+#endif
 
-# if defined(__SUNPRO_C) && defined(__sparcv9) && !defined(__arch64__)
-#  define __arch64__
-# endif
+#if defined(__SUNPRO_C) && defined(__sparcv9) && !defined(__arch64__)
+#define __arch64__
+#endif
 
+/* clang-format off */
 # define SPARC_PIC_THUNK(reg)    \
         .align  32;             \
 .Lpic_thunk:                    \
@@ -74,30 +75,32 @@
         or      reg,%lo(_GLOBAL_OFFSET_TABLE_+4), reg;  \
         add     %o7, reg, reg
 # endif
+/* clang-format on */
 
-# if defined(__arch64__)
+#if defined(__arch64__)
 
-#  define SPARC_LOAD_ADDRESS(SYM, reg)   \
-        setx    SYM, %o7, reg;
-#  define LDPTR          ldx
-#  define SIZE_T_CC      %xcc
-#  define STACK_FRAME    192
-#  define STACK_BIAS     2047
-#  define STACK_7thARG   (STACK_BIAS+176)
+#define SPARC_LOAD_ADDRESS(SYM, reg) \
+    setx SYM, % o7, reg;
+#define LDPTR ldx
+#define SIZE_T_CC % xcc
+#define STACK_FRAME 192
+#define STACK_BIAS 2047
+#define STACK_7thARG (STACK_BIAS + 176)
 
-# else
+#else
 
-#  define SPARC_LOAD_ADDRESS(SYM, reg)   \
-        set     SYM, reg;
-#  define LDPTR          ld
-#  define SIZE_T_CC      %icc
-#  define STACK_FRAME    112
-#  define STACK_BIAS     0
-#  define STACK_7thARG   92
-#  define SPARC_LOAD_ADDRESS_LEAF(SYM,reg,tmp) SPARC_LOAD_ADDRESS(SYM,reg)
+#define SPARC_LOAD_ADDRESS(SYM, reg) \
+    set SYM, reg;
+#define LDPTR ld
+#define SIZE_T_CC % icc
+#define STACK_FRAME 112
+#define STACK_BIAS 0
+#define STACK_7thARG 92
+#define SPARC_LOAD_ADDRESS_LEAF(SYM, reg, tmp) SPARC_LOAD_ADDRESS(SYM, reg)
 
-# endif
+#endif
 
+/* clang-format off */
 # ifdef __PIC__
 #  undef SPARC_LOAD_ADDRESS
 #  undef SPARC_LOAD_ADDRESS_LEAF
@@ -114,9 +117,10 @@
         SPARC_LOAD_ADDRESS(SYM, reg)            \
         mov     tmp, %o7;
 # endif
+/* clang-format on */
 
-# ifndef __ASSEMBLER__
+#ifndef __ASSEMBLER__
 extern unsigned int OPENSSL_sparcv9cap_P[2];
-# endif
+#endif
 
-#endif                          /* OSSL_CRYPTO_SPARC_ARCH_H */
+#endif /* OSSL_CRYPTO_SPARC_ARCH_H */
diff --git a/include/crypto/sparse_array.h b/include/crypto/sparse_array.h
index 7ef742837989..d2629000eeaf 100644
--- a/include/crypto/sparse_array.h
+++ b/include/crypto/sparse_array.h
@@ -9,70 +9,68 @@
  */
 
 #ifndef OSSL_CRYPTO_SPARSE_ARRAY_H
-# define OSSL_CRYPTO_SPARSE_ARRAY_H
-# pragma once
+#define OSSL_CRYPTO_SPARSE_ARRAY_H
+#pragma once
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# define SPARSE_ARRAY_OF(type) struct sparse_array_st_ ## type
+#define SPARSE_ARRAY_OF(type) struct sparse_array_st_##type
 
-# define DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, ctype) \
-    SPARSE_ARRAY_OF(type); \
-    static ossl_unused ossl_inline SPARSE_ARRAY_OF(type) * \
-        ossl_sa_##type##_new(void) \
-    { \
-        return (SPARSE_ARRAY_OF(type) *)ossl_sa_new(); \
-    } \
-    static ossl_unused ossl_inline void \
-    ossl_sa_##type##_free(SPARSE_ARRAY_OF(type) *sa) \
-    { \
-        ossl_sa_free((OPENSSL_SA *)sa); \
-    } \
-    static ossl_unused ossl_inline void \
-    ossl_sa_##type##_free_leaves(SPARSE_ARRAY_OF(type) *sa) \
-    { \
-        ossl_sa_free_leaves((OPENSSL_SA *)sa); \
-    } \
-    static ossl_unused ossl_inline size_t \
-    ossl_sa_##type##_num(const SPARSE_ARRAY_OF(type) *sa) \
-    { \
-        return ossl_sa_num((OPENSSL_SA *)sa); \
-    } \
-    static ossl_unused ossl_inline void \
-    ossl_sa_##type##_doall(const SPARSE_ARRAY_OF(type) *sa, \
-                           void (*leaf)(ossl_uintmax_t, type *)) \
-    { \
-        ossl_sa_doall((OPENSSL_SA *)sa, \
-                      (void (*)(ossl_uintmax_t, void *))leaf); \
-    } \
-    static ossl_unused ossl_inline void \
-    ossl_sa_##type##_doall_arg(const SPARSE_ARRAY_OF(type) *sa, \
-                               void (*leaf)(ossl_uintmax_t, type *, void *), \
-                               void *arg) \
-    { \
-        ossl_sa_doall_arg((OPENSSL_SA *)sa, \
-                          (void (*)(ossl_uintmax_t, void *, void *))leaf, arg); \
-    } \
-    static ossl_unused ossl_inline ctype \
-    *ossl_sa_##type##_get(const SPARSE_ARRAY_OF(type) *sa, ossl_uintmax_t n) \
-    { \
-        return (type *)ossl_sa_get((OPENSSL_SA *)sa, n); \
-    } \
-    static ossl_unused ossl_inline int \
-    ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) *sa, \
-                         ossl_uintmax_t n, ctype *val) \
-    { \
-        return ossl_sa_set((OPENSSL_SA *)sa, n, (void *)val); \
-    } \
+#define DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, ctype)                                                               \
+    SPARSE_ARRAY_OF(type);                                                                                         \
+    static ossl_unused ossl_inline SPARSE_ARRAY_OF(type) * ossl_sa_##type##_new(void)                              \
+    {                                                                                                              \
+        return (SPARSE_ARRAY_OF(type) *)ossl_sa_new();                                                             \
+    }                                                                                                              \
+    static ossl_unused ossl_inline void                                                                            \
+    ossl_sa_##type##_free(SPARSE_ARRAY_OF(type) * sa)                                                              \
+    {                                                                                                              \
+        ossl_sa_free((OPENSSL_SA *)sa);                                                                            \
+    }                                                                                                              \
+    static ossl_unused ossl_inline void                                                                            \
+    ossl_sa_##type##_free_leaves(SPARSE_ARRAY_OF(type) * sa)                                                       \
+    {                                                                                                              \
+        ossl_sa_free_leaves((OPENSSL_SA *)sa);                                                                     \
+    }                                                                                                              \
+    static ossl_unused ossl_inline size_t                                                                          \
+    ossl_sa_##type##_num(const SPARSE_ARRAY_OF(type) * sa)                                                         \
+    {                                                                                                              \
+        return ossl_sa_num((OPENSSL_SA *)sa);                                                                      \
+    }                                                                                                              \
+    static ossl_unused ossl_inline void                                                                            \
+    ossl_sa_##type##_doall(const SPARSE_ARRAY_OF(type) * sa,                                                       \
+        void (*leaf)(ossl_uintmax_t, type *))                                                                      \
+    {                                                                                                              \
+        ossl_sa_doall((OPENSSL_SA *)sa,                                                                            \
+            (void (*)(ossl_uintmax_t, void *))leaf);                                                               \
+    }                                                                                                              \
+    static ossl_unused ossl_inline void                                                                            \
+    ossl_sa_##type##_doall_arg(const SPARSE_ARRAY_OF(type) * sa,                                                   \
+        void (*leaf)(ossl_uintmax_t, type *, void *),                                                              \
+        void *arg)                                                                                                 \
+    {                                                                                                              \
+        ossl_sa_doall_arg((OPENSSL_SA *)sa,                                                                        \
+            (void (*)(ossl_uintmax_t, void *, void *))leaf, arg);                                                  \
+    }                                                                                                              \
+    static ossl_unused ossl_inline ctype *ossl_sa_##type##_get(const SPARSE_ARRAY_OF(type) * sa, ossl_uintmax_t n) \
+    {                                                                                                              \
+        return (type *)ossl_sa_get((OPENSSL_SA *)sa, n);                                                           \
+    }                                                                                                              \
+    static ossl_unused ossl_inline int                                                                             \
+    ossl_sa_##type##_set(SPARSE_ARRAY_OF(type) * sa,                                                               \
+        ossl_uintmax_t n, ctype * val)                                                                             \
+    {                                                                                                              \
+        return ossl_sa_set((OPENSSL_SA *)sa, n, (void *)val);                                                      \
+    }                                                                                                              \
     SPARSE_ARRAY_OF(type)
 
-# define DEFINE_SPARSE_ARRAY_OF(type) \
+#define DEFINE_SPARSE_ARRAY_OF(type) \
     DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, type)
-# define DEFINE_SPARSE_ARRAY_OF_CONST(type) \
+#define DEFINE_SPARSE_ARRAY_OF_CONST(type) \
     DEFINE_SPARSE_ARRAY_OF_INTERNAL(type, const type)
 
 typedef struct sparse_array_st OPENSSL_SA;
@@ -82,11 +80,11 @@ void ossl_sa_free_leaves(OPENSSL_SA *sa);
 size_t ossl_sa_num(const OPENSSL_SA *sa);
 void ossl_sa_doall(const OPENSSL_SA *sa, void (*leaf)(ossl_uintmax_t, void *));
 void ossl_sa_doall_arg(const OPENSSL_SA *sa,
-                       void (*leaf)(ossl_uintmax_t, void *, void *), void *);
+    void (*leaf)(ossl_uintmax_t, void *, void *), void *);
 void *ossl_sa_get(const OPENSSL_SA *sa, ossl_uintmax_t n);
 int ossl_sa_set(OPENSSL_SA *sa, ossl_uintmax_t n, void *val);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/store.h b/include/crypto/store.h
index 9b7be71acd6f..677e619fab47 100644
--- a/include/crypto/store.h
+++ b/include/crypto/store.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OSSL_CRYPTO_STORE_H
-# define OSSL_CRYPTO_STORE_H
-# pragma once
+#define OSSL_CRYPTO_STORE_H
+#pragma once
 
-# include <openssl/bio.h>
-# include <openssl/store.h>
-# include <openssl/ui.h>
+#include <openssl/bio.h>
+#include <openssl/store.h>
+#include <openssl/ui.h>
 
 void ossl_store_cleanup_int(void);
 int ossl_store_loader_get_number(const OSSL_STORE_LOADER *loader);
diff --git a/include/crypto/storeerr.h b/include/crypto/storeerr.h
index c46d845f8e41..33bed4cc24b8 100644
--- a/include/crypto/storeerr.h
+++ b/include/crypto/storeerr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_STOREERR_H
-# define OSSL_CRYPTO_STOREERR_H
-# pragma once
+#define OSSL_CRYPTO_STOREERR_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_OSSL_STORE_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/tserr.h b/include/crypto/tserr.h
index 2f34ba319de8..31c9da41f3d6 100644
--- a/include/crypto/tserr.h
+++ b/include/crypto/tserr.h
@@ -9,22 +9,22 @@
  */
 
 #ifndef OSSL_CRYPTO_TSERR_H
-# define OSSL_CRYPTO_TSERR_H
-# pragma once
+#define OSSL_CRYPTO_TSERR_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
 
-# ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
 
 int ossl_err_load_TS_strings(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/types.h b/include/crypto/types.h
index 2bdd4a38be77..8a9d0029d495 100644
--- a/include/crypto/types.h
+++ b/include/crypto/types.h
@@ -10,24 +10,24 @@
 /* When removal is simulated, we still need the type internally */
 
 #ifndef OSSL_CRYPTO_TYPES_H
-# define OSSL_CRYPTO_TYPES_H
-# pragma once
+#define OSSL_CRYPTO_TYPES_H
+#pragma once
 
-# ifdef OPENSSL_NO_DEPRECATED_3_0
+#ifdef OPENSSL_NO_DEPRECATED_3_0
 typedef struct rsa_st RSA;
 typedef struct rsa_meth_st RSA_METHOD;
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 typedef struct ec_key_st EC_KEY;
 typedef struct ec_key_method_st EC_KEY_METHOD;
-#  endif
-#  ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
 typedef struct dsa_st DSA;
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 typedef struct ecx_key_st ECX_KEY;
-# endif
+#endif
 
 typedef struct prov_skey_st PROV_SKEY;
 
diff --git a/include/crypto/uierr.h b/include/crypto/uierr.h
index 789077a89f3e..dbd149679135 100644
--- a/include/crypto/uierr.h
+++ b/include/crypto/uierr.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_UIERR_H
-# define OSSL_CRYPTO_UIERR_H
-# pragma once
+#define OSSL_CRYPTO_UIERR_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_UI_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/x509.h b/include/crypto/x509.h
index b66eab72c63b..fa085edeb8a2 100644
--- a/include/crypto/x509.h
+++ b/include/crypto/x509.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_CRYPTO_X509_H
-# define OSSL_CRYPTO_X509_H
-# pragma once
+#define OSSL_CRYPTO_X509_H
+#pragma once
 
-# include "internal/refcount.h"
-# include <openssl/asn1.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-# include "crypto/types.h"
+#include "internal/refcount.h"
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/conf.h>
+#include "crypto/types.h"
 
 /* Internal X509 structures and functions: not for application use */
 
@@ -29,21 +29,21 @@
  * in RFC5280 et al.
  */
 struct X509_name_entry_st {
-    ASN1_OBJECT *object;        /* AttributeType */
-    ASN1_STRING *value;         /* AttributeValue */
-    int set;                    /* index of RDNSequence for this entry */
-    int size;                   /* temp variable */
+    ASN1_OBJECT *object; /* AttributeType */
+    ASN1_STRING *value; /* AttributeValue */
+    int set; /* index of RDNSequence for this entry */
+    int size; /* temp variable */
 };
 
 /* Name from RFC 5280. */
 struct X509_name_st {
     STACK_OF(X509_NAME_ENTRY) *entries; /* DN components */
-    int modified;               /* true if 'bytes' needs to be built */
-    BUF_MEM *bytes;             /* cached encoding: cannot be NULL */
+    int modified; /* true if 'bytes' needs to be built */
+    BUF_MEM *bytes; /* cached encoding: cannot be NULL */
     /* canonical encoding used for rapid Name comparison */
     unsigned char *canon_enc;
     int canon_enclen;
-} /* X509_NAME */ ;
+} /* X509_NAME */;
 
 /* Signature info structure */
 
@@ -61,10 +61,10 @@ struct x509_sig_info_st {
 /* PKCS#10 certificate request */
 
 struct X509_req_info_st {
-    ASN1_ENCODING enc;          /* cached encoding of signed part */
-    ASN1_INTEGER *version;      /* version, defaults to v1(0) so can be NULL */
-    X509_NAME *subject;         /* certificate request DN */
-    X509_PUBKEY *pubkey;        /* public key of request */
+    ASN1_ENCODING enc; /* cached encoding of signed part */
+    ASN1_INTEGER *version; /* version, defaults to v1(0) so can be NULL */
+    X509_NAME *subject; /* certificate request DN */
+    X509_PUBKEY *pubkey; /* public key of request */
     /*
      * Zero or more attributes.
      * NB: although attributes is a mandatory field some broken
@@ -74,8 +74,8 @@ struct X509_req_info_st {
 };
 
 struct X509_req_st {
-    X509_REQ_INFO req_info;     /* signed certificate request data */
-    X509_ALGOR sig_alg;         /* signature algorithm */
+    X509_REQ_INFO req_info; /* signed certificate request data */
+    X509_ALGOR sig_alg; /* signature algorithm */
     ASN1_BIT_STRING *signature; /* signature */
     CRYPTO_REF_COUNT references;
     CRYPTO_RWLOCK *lock;
@@ -87,20 +87,20 @@ struct X509_req_st {
 };
 
 struct X509_crl_info_st {
-    ASN1_INTEGER *version;      /* version: defaults to v1(0) so may be NULL */
-    X509_ALGOR sig_alg;         /* signature algorithm */
-    X509_NAME *issuer;          /* CRL issuer name */
-    ASN1_TIME *lastUpdate;      /* lastUpdate field */
-    ASN1_TIME *nextUpdate;      /* nextUpdate field: optional */
-    STACK_OF(X509_REVOKED) *revoked;        /* revoked entries: optional */
-    STACK_OF(X509_EXTENSION) *extensions;   /* extensions: optional */
-    ASN1_ENCODING enc;                      /* encoding of signed portion of CRL */
+    ASN1_INTEGER *version; /* version: defaults to v1(0) so may be NULL */
+    X509_ALGOR sig_alg; /* signature algorithm */
+    X509_NAME *issuer; /* CRL issuer name */
+    ASN1_TIME *lastUpdate; /* lastUpdate field */
+    ASN1_TIME *nextUpdate; /* nextUpdate field: optional */
+    STACK_OF(X509_REVOKED) *revoked; /* revoked entries: optional */
+    STACK_OF(X509_EXTENSION) *extensions; /* extensions: optional */
+    ASN1_ENCODING enc; /* encoding of signed portion of CRL */
 };
 
 struct X509_crl_st {
-    X509_CRL_INFO crl;          /* signed CRL data */
-    X509_ALGOR sig_alg;         /* CRL signature algorithm */
-    ASN1_BIT_STRING signature;  /* CRL signature */
+    X509_CRL_INFO crl; /* signed CRL data */
+    X509_ALGOR sig_alg; /* CRL signature algorithm */
+    ASN1_BIT_STRING signature; /* CRL signature */
     CRYPTO_REF_COUNT references;
     int flags;
     /*
@@ -129,8 +129,8 @@ struct X509_crl_st {
 
 struct x509_revoked_st {
     ASN1_INTEGER serialNumber; /* revoked entry serial number */
-    ASN1_TIME *revocationDate;  /* revocation date */
-    STACK_OF(X509_EXTENSION) *extensions;   /* CRL entry extensions: optional */
+    ASN1_TIME *revocationDate; /* revocation date */
+    STACK_OF(X509_EXTENSION) *extensions; /* CRL entry extensions: optional */
     /* decoded value of CRLissuer extension: set if indirect CRL */
     STACK_OF(GENERAL_NAME) *issuer;
     /* revocation reason: set to CRL_REASON_NONE if reason extension absent */
@@ -152,13 +152,13 @@ struct x509_revoked_st {
 struct x509_cert_aux_st {
     STACK_OF(ASN1_OBJECT) *trust; /* trusted uses */
     STACK_OF(ASN1_OBJECT) *reject; /* rejected uses */
-    ASN1_UTF8STRING *alias;     /* "friendly name" */
-    ASN1_OCTET_STRING *keyid;   /* key id of private key */
+    ASN1_UTF8STRING *alias; /* "friendly name" */
+    ASN1_OCTET_STRING *keyid; /* key id of private key */
     STACK_OF(X509_ALGOR) *other; /* other unspecified info */
 };
 
 struct x509_cinf_st {
-    ASN1_INTEGER *version;      /* [ 0 ] default of v1 */
+    ASN1_INTEGER *version; /* [ 0 ] default of v1 */
     ASN1_INTEGER serialNumber;
     X509_ALGOR signature;
     X509_NAME *issuer;
@@ -191,10 +191,10 @@ struct x509_st {
     STACK_OF(DIST_POINT) *crldp;
     STACK_OF(GENERAL_NAME) *altname;
     NAME_CONSTRAINTS *nc;
-# ifndef OPENSSL_NO_RFC3779
+#ifndef OPENSSL_NO_RFC3779
     STACK_OF(IPAddressFamily) *rfc3779_addr;
     struct ASIdentifiers_st *rfc3779_asid;
-# endif
+#endif
     unsigned char sha1_hash[SHA_DIGEST_LENGTH];
     X509_CERT_AUX *aux;
     CRYPTO_RWLOCK *lock;
@@ -205,14 +205,14 @@ struct x509_st {
 
     OSSL_LIB_CTX *libctx;
     char *propq;
-} /* X509 */ ;
+} /* X509 */;
 
 /*
  * This is a used when verifying cert chains.  Since the gathering of the
  * cert chain can take some time (and have to be 'retried', this needs to be
  * kept and passed around.
  */
-struct x509_store_ctx_st {      /* X509_STORE_CTX */
+struct x509_store_ctx_st { /* X509_STORE_CTX */
     X509_STORE *store;
     /* The following are set by the caller */
     /* The cert to check */
@@ -226,29 +226,29 @@ struct x509_store_ctx_st {      /* X509_STORE_CTX */
     void *other_ctx;
     /* Callbacks for various operations */
     /* called to verify a certificate */
-    int (*verify) (X509_STORE_CTX *ctx);
+    int (*verify)(X509_STORE_CTX *ctx);
     /* error callback */
-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);
+    int (*verify_cb)(int ok, X509_STORE_CTX *ctx);
     /* get issuers cert from ctx */
-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
+    int (*get_issuer)(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
     /* check issued */
-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
+    int (*check_issued)(X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
     /* Check revocation status of chain */
-    int (*check_revocation) (X509_STORE_CTX *ctx);
+    int (*check_revocation)(X509_STORE_CTX *ctx);
     /* retrieve CRL */
-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
+    int (*get_crl)(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
     /* Check CRL validity */
-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);
+    int (*check_crl)(X509_STORE_CTX *ctx, X509_CRL *crl);
     /* Check certificate against CRL */
-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
+    int (*cert_crl)(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
     /* Check policy status of the chain */
-    int (*check_policy) (X509_STORE_CTX *ctx);
-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx,
-                                     const X509_NAME *nm);
+    int (*check_policy)(X509_STORE_CTX *ctx);
+    STACK_OF(X509) *(*lookup_certs)(X509_STORE_CTX *ctx,
+        const X509_NAME *nm);
     /* cannot constify 'ctx' param due to lookup_certs_sk() in x509_vfy.c */
-    STACK_OF(X509_CRL) *(*lookup_crls) (const X509_STORE_CTX *ctx,
-                                        const X509_NAME *nm);
-    int (*cleanup) (X509_STORE_CTX *ctx);
+    STACK_OF(X509_CRL) *(*lookup_crls)(const X509_STORE_CTX *ctx,
+        const X509_NAME *nm);
+    int (*cleanup)(X509_STORE_CTX *ctx);
     /* The following is built up */
     /* if 0, rebuild chain */
     int valid;
@@ -317,84 +317,84 @@ int ossl_x509_init_sig_info(X509 *x);
 
 int ossl_x509_set0_libctx(X509 *x, OSSL_LIB_CTX *libctx, const char *propq);
 int ossl_x509_crl_set0_libctx(X509_CRL *x, OSSL_LIB_CTX *libctx,
-                              const char *propq);
+    const char *propq);
 int ossl_x509_req_set0_libctx(X509_REQ *x, OSSL_LIB_CTX *libctx,
-                              const char *propq);
+    const char *propq);
 int ossl_asn1_item_digest_ex(const ASN1_ITEM *it, const EVP_MD *type,
-                             void *data, unsigned char *md, unsigned int *len,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    void *data, unsigned char *md, unsigned int *len,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int ossl_x509_add_cert_new(STACK_OF(X509) **sk, X509 *cert, int flags);
 int ossl_x509_add_certs_new(STACK_OF(X509) **p_sk, STACK_OF(X509) *certs,
-                            int flags);
+    int flags);
 
 STACK_OF(X509_ATTRIBUTE) *ossl_x509at_dup(const STACK_OF(X509_ATTRIBUTE) *x);
 
 int ossl_x509_PUBKEY_get0_libctx(OSSL_LIB_CTX **plibctx, const char **ppropq,
-                                 const X509_PUBKEY *key);
+    const X509_PUBKEY *key);
 /* Calculate default key identifier according to RFC 5280 section 4.2.1.2 (1) */
 ASN1_OCTET_STRING *ossl_x509_pubkey_hash(X509_PUBKEY *pubkey);
 
 X509_PUBKEY *ossl_d2i_X509_PUBKEY_INTERNAL(const unsigned char **pp,
-                                           long len, OSSL_LIB_CTX *libctx,
-                                           const char *propq);
+    long len, OSSL_LIB_CTX *libctx,
+    const char *propq);
 void ossl_X509_PUBKEY_INTERNAL_free(X509_PUBKEY *xpub);
 
 RSA *ossl_d2i_RSA_PSS_PUBKEY(RSA **a, const unsigned char **pp, long length);
 int ossl_i2d_RSA_PSS_PUBKEY(const RSA *a, unsigned char **pp);
-# ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 DSA *ossl_d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, long length);
-# endif /* OPENSSL_NO_DSA */
-# ifndef OPENSSL_NO_DH
+#endif /* OPENSSL_NO_DSA */
+#ifndef OPENSSL_NO_DH
 DH *ossl_d2i_DH_PUBKEY(DH **a, const unsigned char **pp, long length);
 int ossl_i2d_DH_PUBKEY(const DH *a, unsigned char **pp);
 DH *ossl_d2i_DHx_PUBKEY(DH **a, const unsigned char **pp, long length);
 int ossl_i2d_DHx_PUBKEY(const DH *a, unsigned char **pp);
-# endif /* OPENSSL_NO_DH */
-# ifndef OPENSSL_NO_EC
+#endif /* OPENSSL_NO_DH */
+#ifndef OPENSSL_NO_EC
 ECX_KEY *ossl_d2i_ED25519_PUBKEY(ECX_KEY **a,
-                                 const unsigned char **pp, long length);
+    const unsigned char **pp, long length);
 int ossl_i2d_ED25519_PUBKEY(const ECX_KEY *a, unsigned char **pp);
 ECX_KEY *ossl_d2i_ED448_PUBKEY(ECX_KEY **a,
-                               const unsigned char **pp, long length);
+    const unsigned char **pp, long length);
 int ossl_i2d_ED448_PUBKEY(const ECX_KEY *a, unsigned char **pp);
 ECX_KEY *ossl_d2i_X25519_PUBKEY(ECX_KEY **a,
-                                const unsigned char **pp, long length);
+    const unsigned char **pp, long length);
 int ossl_i2d_X25519_PUBKEY(const ECX_KEY *a, unsigned char **pp);
 ECX_KEY *ossl_d2i_X448_PUBKEY(ECX_KEY **a,
-                              const unsigned char **pp, long length);
+    const unsigned char **pp, long length);
 int ossl_i2d_X448_PUBKEY(const ECX_KEY *a, unsigned char **pp);
-# endif /* OPENSSL_NO_EC */
+#endif /* OPENSSL_NO_EC */
 
 EVP_PKEY *ossl_d2i_PUBKEY_legacy(EVP_PKEY **a, const unsigned char **pp,
-                                 long length);
+    long length);
 int ossl_x509_check_private_key(const EVP_PKEY *k, const EVP_PKEY *pkey);
 
 int x509v3_add_len_value_uchar(const char *name, const unsigned char *value,
-                               size_t vallen, STACK_OF(CONF_VALUE) **extlist);
+    size_t vallen, STACK_OF(CONF_VALUE) **extlist);
 /* Attribute addition functions not checking for duplicate attributes */
 STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                                const X509_ATTRIBUTE *attr);
+    const X509_ATTRIBUTE *attr);
 STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
-                                                       const ASN1_OBJECT *obj,
-                                                       int type,
-                                                       const unsigned char *bytes,
-                                                       int len);
+    const ASN1_OBJECT *obj,
+    int type,
+    const unsigned char *bytes,
+    int len);
 STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
-                                                       int nid, int type,
-                                                       const unsigned char *bytes,
-                                                       int len);
+    int nid, int type,
+    const unsigned char *bytes,
+    int len);
 STACK_OF(X509_ATTRIBUTE) *ossl_x509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
-                                                       const char *attrname,
-                                                       int type,
-                                                       const unsigned char *bytes,
-                                                       int len);
-                                            
+    const char *attrname,
+    int type,
+    const unsigned char *bytes,
+    int len);
+
 int ossl_print_attribute_value(BIO *out,
-                               int obj_nid,
-                               const ASN1_TYPE *av,
-                               int indent);
+    int obj_nid,
+    const ASN1_TYPE *av,
+    int indent);
 
 int ossl_serial_number_print(BIO *out, const ASN1_INTEGER *bs, int indent);
 int ossl_bio_print_hex(BIO *out, unsigned char *buf, int len);
 
-#endif  /* OSSL_CRYPTO_X509_H */
+#endif /* OSSL_CRYPTO_X509_H */
diff --git a/include/crypto/x509_acert.h b/include/crypto/x509_acert.h
index 79cb07ba365a..083133c8e347 100644
--- a/include/crypto/x509_acert.h
+++ b/include/crypto/x509_acert.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_CRYPTO_X509_ACERT_H
-# define OSSL_CRYPTO_X509_ACERT_H
-# pragma once
+#define OSSL_CRYPTO_X509_ACERT_H
+#pragma once
 
-# include <openssl/x509_acert.h>
+#include <openssl/x509_acert.h>
 
-#define OSSL_ODI_TYPE_PUBLIC_KEY      0
+#define OSSL_ODI_TYPE_PUBLIC_KEY 0
 #define OSSL_ODI_TYPE_PUBLIC_KEY_CERT 1
-#define OSSL_ODI_TYPE_OTHER           2
+#define OSSL_ODI_TYPE_OTHER 2
 
 struct ossl_object_digest_info_st {
     ASN1_ENUMERATED digestedObjectType;
@@ -51,7 +51,7 @@ typedef struct X509_holder_st {
 } X509_HOLDER;
 
 struct X509_acert_info_st {
-    ASN1_INTEGER version;      /* default of v2 */
+    ASN1_INTEGER version; /* default of v2 */
     X509_HOLDER holder;
     X509_ACERT_ISSUER issuer;
     X509_ALGOR signature;
diff --git a/include/crypto/x509err.h b/include/crypto/x509err.h
index c7c7d25e97f7..4d4572861bc6 100644
--- a/include/crypto/x509err.h
+++ b/include/crypto/x509err.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_X509ERR_H
-# define OSSL_CRYPTO_X509ERR_H
-# pragma once
+#define OSSL_CRYPTO_X509ERR_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_X509_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/crypto/x509v3err.h b/include/crypto/x509v3err.h
index 66d3ad92f865..b3874fc47215 100644
--- a/include/crypto/x509v3err.h
+++ b/include/crypto/x509v3err.h
@@ -9,19 +9,19 @@
  */
 
 #ifndef OSSL_CRYPTO_X509V3ERR_H
-# define OSSL_CRYPTO_X509V3ERR_H
-# pragma once
+#define OSSL_CRYPTO_X509V3ERR_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_X509V3_strings(void);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/internal/asn1.h b/include/internal/asn1.h
index 36dbe0fcd32d..509e5986cee6 100644
--- a/include/internal/asn1.h
+++ b/include/internal/asn1.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_INTERNAL_ASN1_H
-# define OSSL_INTERNAL_ASN1_H
-# pragma once
+#define OSSL_INTERNAL_ASN1_H
+#pragma once
 
-# include <openssl/bio.h>
+#include <openssl/bio.h>
 
 int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb);
 
diff --git a/include/internal/bio.h b/include/internal/bio.h
index 9481f4c985e0..371421139c42 100644
--- a/include/internal/bio.h
+++ b/include/internal/bio.h
@@ -8,42 +8,41 @@
  */
 
 #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 (*bsendmmsg) (BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *);
-    int (*brecvmmsg) (BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *);
+    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 (*bsendmmsg)(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *);
+    int (*brecvmmsg)(BIO *, BIO_MSG *, size_t, size_t, uint64_t, size_t *);
 };
 
 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_TX_ZEROCOPY_SENDFILE 90
+#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_TX_ZEROCOPY_SENDFILE 90
 
 /*
  * This is used with socket BIOs:
@@ -53,42 +52,42 @@ int bread_conv(BIO *bio, char *data, size_t datal, size_t *read);
  * BIO_FLAGS_KTLS_TX_ZEROCOPY_SENDFILE means we are using the zerocopy mode with
  * this BIO for sending using sendfile.
  */
-# 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_ZEROCOPY_SENDFILE 0x8000
+#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_ZEROCOPY_SENDFILE 0x8000
 
 /* 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_zerocopy_sendfile_flag(b) \
+#define BIO_set_ktls_zerocopy_sendfile_flag(b) \
     BIO_set_flags(b, BIO_FLAGS_KTLS_TX_ZEROCOPY_SENDFILE)
 
-# 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_tx_zerocopy_sendfile(b) \
-     BIO_ctrl(b, BIO_CTRL_SET_KTLS_TX_ZEROCOPY_SENDFILE, 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)
+#define BIO_set_ktls_tx_zerocopy_sendfile(b) \
+    BIO_ctrl(b, BIO_CTRL_SET_KTLS_TX_ZEROCOPY_SENDFILE, 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/bio_addr.h b/include/internal/bio_addr.h
index 072f404a2c52..911147b0009e 100644
--- a/include/internal/bio_addr.h
+++ b/include/internal/bio_addr.h
@@ -8,23 +8,23 @@
  */
 
 #ifndef OSSL_BIO_ADDR_H
-# define OSSL_BIO_ADDR_H
+#define OSSL_BIO_ADDR_H
 
-# include "internal/e_os.h"
-# include "internal/e_winsock.h"
-# include "internal/sockets.h"
+#include "internal/e_os.h"
+#include "internal/e_winsock.h"
+#include "internal/sockets.h"
 
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 union bio_addr_st {
     struct sockaddr sa;
-#  if OPENSSL_USE_IPV6
+#if OPENSSL_USE_IPV6
     struct sockaddr_in6 s_in6;
-#  endif
+#endif
     struct sockaddr_in s_in;
-#  ifndef OPENSSL_NO_UNIX_SOCK
+#ifndef OPENSSL_NO_UNIX_SOCK
     struct sockaddr_un s_un;
-#  endif
+#endif
 };
-# endif
+#endif
 
 #endif
diff --git a/include/internal/bio_tfo.h b/include/internal/bio_tfo.h
index 64c0d4c32724..bfce90afafef 100644
--- a/include/internal/bio_tfo.h
+++ b/include/internal/bio_tfo.h
@@ -15,9 +15,9 @@
 /* If a supported OS is added here, update test/bio_tfo_test.c */
 #if defined(TCP_FASTOPEN) && !defined(OPENSSL_NO_TFO)
 
-# if defined(OPENSSL_SYS_MACOSX) || defined(__FreeBSD__)
-#  include <sys/sysctl.h>
-# endif
+#if defined(OPENSSL_SYS_MACOSX) || defined(__FreeBSD__)
+#include <sys/sysctl.h>
+#endif
 
 /*
  * OSSL_TFO_SYSCTL is used to determine if TFO is supported by
@@ -82,7 +82,7 @@
  *     client socket (macOS, FreeBSD, Linux pre-4.14)
  */
 
-# if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS)
 /*
  * NO WINDOWS SUPPORT
  *
@@ -93,59 +93,59 @@
  *
  * Still have to figure out client support
  */
-#  undef TCP_FASTOPEN
-# endif
+#undef TCP_FASTOPEN
+#endif
 
 /* NO VMS SUPPORT */
-# if defined(OPENSSL_SYS_VMS)
-#  undef TCP_FASTOPEN
-# endif
+#if defined(OPENSSL_SYS_VMS)
+#undef TCP_FASTOPEN
+#endif
 
-# if defined(OPENSSL_SYS_MACOSX)
-#  define OSSL_TFO_SYSCTL               "net.inet.tcp.fastopen"
-#  define OSSL_TFO_SERVER_SOCKOPT       TCP_FASTOPEN
-#  define OSSL_TFO_SERVER_SOCKOPT_VALUE 1
-#  define OSSL_TFO_CONNECTX             1
-#  define OSSL_TFO_DO_NOT_CONNECT       1
-#  define OSSL_TFO_CLIENT_FLAG          1
-#  define OSSL_TFO_SERVER_FLAG          2
-# endif
+#if defined(OPENSSL_SYS_MACOSX)
+#define OSSL_TFO_SYSCTL "net.inet.tcp.fastopen"
+#define OSSL_TFO_SERVER_SOCKOPT TCP_FASTOPEN
+#define OSSL_TFO_SERVER_SOCKOPT_VALUE 1
+#define OSSL_TFO_CONNECTX 1
+#define OSSL_TFO_DO_NOT_CONNECT 1
+#define OSSL_TFO_CLIENT_FLAG 1
+#define OSSL_TFO_SERVER_FLAG 2
+#endif
 
-# if defined(__FreeBSD__)
-#  if defined(TCP_FASTOPEN_PSK_LEN)
+#if defined(__FreeBSD__)
+#if defined(TCP_FASTOPEN_PSK_LEN)
 /* As of 12.0 these are the SYSCTLs */
-#   define OSSL_TFO_SYSCTL_SERVER        "net.inet.tcp.fastopen.server_enable"
-#   define OSSL_TFO_SYSCTL_CLIENT        "net.inet.tcp.fastopen.client_enable"
-#   define OSSL_TFO_SERVER_SOCKOPT       TCP_FASTOPEN
-#   define OSSL_TFO_SERVER_SOCKOPT_VALUE MAX_LISTEN
-#   define OSSL_TFO_CLIENT_SOCKOPT       TCP_FASTOPEN
-#   define OSSL_TFO_DO_NOT_CONNECT       1
-#   define OSSL_TFO_SENDTO               0
+#define OSSL_TFO_SYSCTL_SERVER "net.inet.tcp.fastopen.server_enable"
+#define OSSL_TFO_SYSCTL_CLIENT "net.inet.tcp.fastopen.client_enable"
+#define OSSL_TFO_SERVER_SOCKOPT TCP_FASTOPEN
+#define OSSL_TFO_SERVER_SOCKOPT_VALUE MAX_LISTEN
+#define OSSL_TFO_CLIENT_SOCKOPT TCP_FASTOPEN
+#define OSSL_TFO_DO_NOT_CONNECT 1
+#define OSSL_TFO_SENDTO 0
 /* These are the same because the sysctl are client/server-specific */
-#   define OSSL_TFO_CLIENT_FLAG          1
-#   define OSSL_TFO_SERVER_FLAG          1
-#  else
+#define OSSL_TFO_CLIENT_FLAG 1
+#define OSSL_TFO_SERVER_FLAG 1
+#else
 /* 10.3 through 11.4 SYSCTL - ONLY SERVER SUPPORT */
-#   define OSSL_TFO_SYSCTL               "net.inet.tcp.fastopen.enabled"
-#   define OSSL_TFO_SERVER_SOCKOPT       TCP_FASTOPEN
-#   define OSSL_TFO_SERVER_SOCKOPT_VALUE MAX_LISTEN
-#   define OSSL_TFO_SERVER_FLAG          1
-#  endif
-# endif
+#define OSSL_TFO_SYSCTL "net.inet.tcp.fastopen.enabled"
+#define OSSL_TFO_SERVER_SOCKOPT TCP_FASTOPEN
+#define OSSL_TFO_SERVER_SOCKOPT_VALUE MAX_LISTEN
+#define OSSL_TFO_SERVER_FLAG 1
+#endif
+#endif
 
-# if defined(OPENSSL_SYS_LINUX)
+#if defined(OPENSSL_SYS_LINUX)
 /* OSSL_TFO_PROC not used, but of interest */
-#  define OSSL_TFO_PROC                 "/proc/sys/net/ipv4/tcp_fastopen"
-#  define OSSL_TFO_SERVER_SOCKOPT       TCP_FASTOPEN
-#  define OSSL_TFO_SERVER_SOCKOPT_VALUE MAX_LISTEN
-#  if defined(TCP_FASTOPEN_CONNECT)
-#   define OSSL_TFO_CLIENT_SOCKOPT      TCP_FASTOPEN_CONNECT
-#  else
-#   define OSSL_TFO_SENDTO              MSG_FASTOPEN
-#   define OSSL_TFO_DO_NOT_CONNECT      1
-#  endif
-#  define OSSL_TFO_CLIENT_FLAG          1
-#  define OSSL_TFO_SERVER_FLAG          2
-# endif
+#define OSSL_TFO_PROC "/proc/sys/net/ipv4/tcp_fastopen"
+#define OSSL_TFO_SERVER_SOCKOPT TCP_FASTOPEN
+#define OSSL_TFO_SERVER_SOCKOPT_VALUE MAX_LISTEN
+#if defined(TCP_FASTOPEN_CONNECT)
+#define OSSL_TFO_CLIENT_SOCKOPT TCP_FASTOPEN_CONNECT
+#else
+#define OSSL_TFO_SENDTO MSG_FASTOPEN
+#define OSSL_TFO_DO_NOT_CONNECT 1
+#endif
+#define OSSL_TFO_CLIENT_FLAG 1
+#define OSSL_TFO_SERVER_FLAG 2
+#endif
 
 #endif
diff --git a/include/internal/cms.h b/include/internal/cms.h
index d32b64a25fde..9cf2314fa19f 100644
--- a/include/internal/cms.h
+++ b/include/internal/cms.h
@@ -7,16 +7,16 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_INTERNAL_CMS_H
-# define OSSL_INTERNAL_CMS_H
-# pragma once
+#define OSSL_INTERNAL_CMS_H
+#pragma once
 
-# include <openssl/cms.h>
+#include <openssl/cms.h>
 
-# ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
 CMS_EnvelopedData *ossl_cms_sign_encrypt(BIO *data, X509 *sign_cert, STACK_OF(X509) *certs,
-                                         EVP_PKEY *sign_key, unsigned int sign_flags,
-                                         STACK_OF(X509) *enc_recip, const EVP_CIPHER *cipher,
-                                         unsigned int enc_flags, OSSL_LIB_CTX *libctx,
-                                         const char *propq);
-# endif /* OPENSSL_NO_CMS */
+    EVP_PKEY *sign_key, unsigned int sign_flags,
+    STACK_OF(X509) *enc_recip, const EVP_CIPHER *cipher,
+    unsigned int enc_flags, OSSL_LIB_CTX *libctx,
+    const char *propq);
+#endif /* OPENSSL_NO_CMS */
 #endif /* OSSL_INTERNAL_CMS_H */
diff --git a/include/internal/common.h b/include/internal/common.h
index 894dac9a4e2b..5de7279691a8 100644
--- a/include/internal/common.h
+++ b/include/internal/common.h
@@ -8,40 +8,40 @@
  */
 
 #ifndef OSSL_INTERNAL_COMMON_H
-# define OSSL_INTERNAL_COMMON_H
-# pragma once
+#define OSSL_INTERNAL_COMMON_H
+#pragma once
 
-# include <stdlib.h>
-# include <string.h>
-# include "openssl/configuration.h"
+#include <stdlib.h>
+#include <string.h>
+#include "openssl/configuration.h"
 
-# include "internal/e_os.h" /* ossl_inline in many files */
-# include "internal/nelem.h"
+#include "internal/e_os.h" /* ossl_inline in many files */
+#include "internal/nelem.h"
 
-# if defined(__GNUC__) || defined(__clang__)
-#  define ossl_likely(x)     __builtin_expect(!!(x), 1)
-#  define ossl_unlikely(x)   __builtin_expect(!!(x), 0)
-# else
-#  define ossl_likely(x)     (x)
-#  define ossl_unlikely(x)   (x)
-# endif
+#if defined(__GNUC__) || defined(__clang__)
+#define ossl_likely(x) __builtin_expect(!!(x), 1)
+#define ossl_unlikely(x) __builtin_expect(!!(x), 0)
+#else
+#define ossl_likely(x) (x)
+#define ossl_unlikely(x) (x)
+#endif
 
-# if defined(__GNUC__) || defined(__clang__)
-#  define ALIGN32       __attribute((aligned(32)))
-#  define ALIGN64       __attribute((aligned(64)))
-# elif defined(_MSC_VER)
-#  define ALIGN32       __declspec(align(32))
-#  define ALIGN64       __declspec(align(64))
-# else
-#  define ALIGN32
-#  define ALIGN64
-# endif
+#if defined(__GNUC__) || defined(__clang__)
+#define ALIGN32 __attribute((aligned(32)))
+#define ALIGN64 __attribute((aligned(64)))
+#elif defined(_MSC_VER)
+#define ALIGN32 __declspec(align(32))
+#define ALIGN64 __declspec(align(64))
+#else
+#define ALIGN32
+#define ALIGN64
+#endif
 
-# ifdef NDEBUG
-#  define ossl_assert(x) ossl_likely((x) != 0)
-# else
+#ifdef NDEBUG
+#define ossl_assert(x) ossl_likely((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);
@@ -49,10 +49,10 @@ __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
+#endif
 
 /* Check if |pre|, which must be a string literal, is a prefix of |str| */
 #define HAS_PREFIX(str, pre) (strncmp(str, pre "", sizeof(pre) - 1) == 0)
@@ -65,136 +65,152 @@ __owur static ossl_inline int ossl_assert_int(int expr, const char *exprstr,
 #define CHECK_AND_SKIP_CASE_PREFIX(str, pre) \
     (HAS_CASE_PREFIX(str, pre) ? ((str) += sizeof(pre) - 1, 1) : 0)
 /* Check if the string literal |suffix| is a case-insensitive suffix of |str| */
-#define HAS_CASE_SUFFIX(str, suffix) (strlen(str) < sizeof(suffix) - 1 ? 0 : \
-    OPENSSL_strcasecmp(str + strlen(str) - sizeof(suffix) + 1, suffix "") == 0)
+#define HAS_CASE_SUFFIX(str, suffix) (strlen(str) < sizeof(suffix) - 1 ? 0 : OPENSSL_strcasecmp(str + strlen(str) - sizeof(suffix) + 1, suffix "") == 0)
 
 /*
  * Use this inside a union with the field that needs to be aligned to a
  * 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
 
-# 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)
 
-# define c2l(c,l)        (l = ((unsigned long)(*((c)++)))     , \
-                         l|=(((unsigned long)(*((c)++)))<< 8), \
-                         l|=(((unsigned long)(*((c)++)))<<16), \
-                         l|=(((unsigned long)(*((c)++)))<<24))
+#define c2l(c, l) (l = ((unsigned long)(*((c)++))), \
+    l |= (((unsigned long)(*((c)++))) << 8),        \
+    l |= (((unsigned long)(*((c)++))) << 16),       \
+    l |= (((unsigned long)(*((c)++))) << 24))
 
 /* NOTE - c is not incremented as per c2l */
-# define c2ln(c,l1,l2,n) { \
-                        c+=n; \
-                        l1=l2=0; \
-                        switch (n) { \
-                        case 8: l2 =((unsigned long)(*(--(c))))<<24; \
-                        case 7: l2|=((unsigned long)(*(--(c))))<<16; \
-                        case 6: l2|=((unsigned long)(*(--(c))))<< 8; \
-                        case 5: l2|=((unsigned long)(*(--(c))));     \
-                        case 4: l1 =((unsigned long)(*(--(c))))<<24; \
-                        case 3: l1|=((unsigned long)(*(--(c))))<<16; \
-                        case 2: l1|=((unsigned long)(*(--(c))))<< 8; \
-                        case 1: l1|=((unsigned long)(*(--(c))));     \
-                                } \
-                        }
+#define c2ln(c, l1, l2, n)                           \
+    {                                                \
+        c += n;                                      \
+        l1 = l2 = 0;                                 \
+        switch (n) {                                 \
+        case 8:                                      \
+            l2 = ((unsigned long)(*(--(c)))) << 24;  \
+        case 7:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 16; \
+        case 6:                                      \
+            l2 |= ((unsigned long)(*(--(c)))) << 8;  \
+        case 5:                                      \
+            l2 |= ((unsigned long)(*(--(c))));       \
+        case 4:                                      \
+            l1 = ((unsigned long)(*(--(c)))) << 24;  \
+        case 3:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 16; \
+        case 2:                                      \
+            l1 |= ((unsigned long)(*(--(c)))) << 8;  \
+        case 1:                                      \
+            l1 |= ((unsigned long)(*(--(c))));       \
+        }                                            \
+    }
 
-# define l2c(l,c)        (*((c)++)=(unsigned char)(((l)    )&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff))
+#define l2c(l, c) (*((c)++) = (unsigned char)(((l)) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 8) & 0xff),           \
+    *((c)++) = (unsigned char)(((l) >> 16) & 0xff),          \
+    *((c)++) = (unsigned char)(((l) >> 24) & 0xff))
 
-# define n2l(c,l)        (l =((unsigned long)(*((c)++)))<<24, \
-                         l|=((unsigned long)(*((c)++)))<<16, \
-                         l|=((unsigned long)(*((c)++)))<< 8, \
-                         l|=((unsigned long)(*((c)++))))
+#define n2l(c, l) (l = ((unsigned long)(*((c)++))) << 24, \
+    l |= ((unsigned long)(*((c)++))) << 16,               \
+    l |= ((unsigned long)(*((c)++))) << 8,                \
+    l |= ((unsigned long)(*((c)++))))
 
-# define n2l8(c,l)       (l =((uint64_t)(*((c)++)))<<56, \
-                         l|=((uint64_t)(*((c)++)))<<48, \
-                         l|=((uint64_t)(*((c)++)))<<40, \
-                         l|=((uint64_t)(*((c)++)))<<32, \
-                         l|=((uint64_t)(*((c)++)))<<24, \
-                         l|=((uint64_t)(*((c)++)))<<16, \
-                         l|=((uint64_t)(*((c)++)))<< 8, \
-                         l|=((uint64_t)(*((c)++))))
+#define n2l8(c, l) (l = ((uint64_t)(*((c)++))) << 56, \
+    l |= ((uint64_t)(*((c)++))) << 48,                \
+    l |= ((uint64_t)(*((c)++))) << 40,                \
+    l |= ((uint64_t)(*((c)++))) << 32,                \
+    l |= ((uint64_t)(*((c)++))) << 24,                \
+    l |= ((uint64_t)(*((c)++))) << 16,                \
+    l |= ((uint64_t)(*((c)++))) << 8,                 \
+    l |= ((uint64_t)(*((c)++))))
 
-# define l2n(l,c)        (*((c)++)=(unsigned char)(((l)>>24)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
-                         *((c)++)=(unsigned char)(((l)    )&0xff))
+#define l2n(l, c) (*((c)++) = (unsigned char)(((l) >> 24) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 16) & 0xff),                \
+    *((c)++) = (unsigned char)(((l) >> 8) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l)) & 0xff))
 
-# define l2n8(l,c)       (*((c)++)=(unsigned char)(((l)>>56)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>48)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>40)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>32)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>24)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>>16)&0xff), \
-                         *((c)++)=(unsigned char)(((l)>> 8)&0xff), \
-                         *((c)++)=(unsigned char)(((l)    )&0xff))
+#define l2n8(l, c) (*((c)++) = (unsigned char)(((l) >> 56) & 0xff), \
+    *((c)++) = (unsigned char)(((l) >> 48) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l) >> 40) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l) >> 32) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l) >> 24) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l) >> 16) & 0xff),                 \
+    *((c)++) = (unsigned char)(((l) >> 8) & 0xff),                  \
+    *((c)++) = (unsigned char)(((l)) & 0xff))
 
 /* NOTE - c is not incremented as per l2c */
-# define l2cn(l1,l2,c,n) { \
-                        c+=n; \
-                        switch (n) { \
-                        case 8: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \
-                        case 7: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \
-                        case 6: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \
-                        case 5: *(--(c))=(unsigned char)(((l2)    )&0xff); \
-                        case 4: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \
-                        case 3: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \
-                        case 2: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \
-                        case 1: *(--(c))=(unsigned char)(((l1)    )&0xff); \
-                                } \
-                        }
+#define l2cn(l1, l2, c, n)                                   \
+    {                                                        \
+        c += n;                                              \
+        switch (n) {                                         \
+        case 8:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 24) & 0xff); \
+        case 7:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 16) & 0xff); \
+        case 6:                                              \
+            *(--(c)) = (unsigned char)(((l2) >> 8) & 0xff);  \
+        case 5:                                              \
+            *(--(c)) = (unsigned char)(((l2)) & 0xff);       \
+        case 4:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 24) & 0xff); \
+        case 3:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 16) & 0xff); \
+        case 2:                                              \
+            *(--(c)) = (unsigned char)(((l1) >> 8) & 0xff);  \
+        case 1:                                              \
+            *(--(c)) = (unsigned char)(((l1)) & 0xff);       \
+        }                                                    \
+    }
 
-# define n2s(c,s)        ((s=(((unsigned int)((c)[0]))<< 8)| \
-                             (((unsigned int)((c)[1]))    )),(c)+=2)
-# define s2n(s,c)        (((c)[0]=(unsigned char)(((s)>> 8)&0xff), \
-                           (c)[1]=(unsigned char)(((s)    )&0xff)),(c)+=2)
+#define n2s(c, s) ((s = (((unsigned int)((c)[0])) << 8) | (((unsigned int)((c)[1])))), (c) += 2)
+#define s2n(s, c) (((c)[0] = (unsigned char)(((s) >> 8) & 0xff), \
+                       (c)[1] = (unsigned char)(((s)) & 0xff)),  \
+    (c) += 2)
 
-# define n2l3(c,l)       ((l =(((unsigned long)((c)[0]))<<16)| \
-                              (((unsigned long)((c)[1]))<< 8)| \
-                              (((unsigned long)((c)[2]))    )),(c)+=3)
+#define n2l3(c, l) ((l = (((unsigned long)((c)[0])) << 16) | (((unsigned long)((c)[1])) << 8) | (((unsigned long)((c)[2])))), (c) += 3)
 
-# define l2n3(l,c)       (((c)[0]=(unsigned char)(((l)>>16)&0xff), \
-                           (c)[1]=(unsigned char)(((l)>> 8)&0xff), \
-                           (c)[2]=(unsigned char)(((l)    )&0xff)),(c)+=3)
+#define l2n3(l, c) (((c)[0] = (unsigned char)(((l) >> 16) & 0xff),   \
+                        (c)[1] = (unsigned char)(((l) >> 8) & 0xff), \
+                        (c)[2] = (unsigned char)(((l)) & 0xff)),     \
+    (c) += 3)
 
 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 == '/';
 }
 
@@ -203,28 +219,28 @@ static ossl_inline char ossl_determine_dirsep(const char *path)
     if (ossl_ends_with_dirsep(path))
         return '\0';
 
-# if defined(_WIN32)
+#if defined(_WIN32)
     return '\\';
-# elif defined(__VMS)
+#elif defined(__VMS)
     return ':';
-# else
+#else
     return '/';
-# endif
+#endif
 }
 
 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/comp.h b/include/internal/comp.h
index 696042754299..a0151e2b5014 100644
--- a/include/internal/comp.h
+++ b/include/internal/comp.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef _INTERNAL_COMP_H
-#define	_INTERNAL_COMP_H
+#define _INTERNAL_COMP_H
 
 #include <openssl/comp.h>
 
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 73219759e0ce..34f2b78329d5 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,10 +38,10 @@ 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 uint32_t. */
 static ossl_inline uint32_t constant_time_lt_32(uint32_t a, uint32_t b);
 
@@ -50,10 +50,10 @@ 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);
@@ -64,10 +64,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. */
@@ -81,31 +81,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);
@@ -122,7 +120,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)));
 }
@@ -133,7 +131,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);
 }
@@ -176,21 +174,21 @@ 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);
 }
 
 static ossl_inline BN_ULONG constant_time_select_bn(BN_ULONG mask,
-                                                    BN_ULONG a,
-                                                    BN_ULONG b)
+    BN_ULONG a,
+    BN_ULONG b)
 {
     return (value_barrier_bn(mask) & a) | (value_barrier_bn(~mask) & 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);
 }
@@ -201,7 +199,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);
 }
@@ -237,7 +235,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);
 }
@@ -248,7 +246,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);
 }
@@ -335,28 +333,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));
 }
@@ -364,17 +362,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);
 }
@@ -390,11 +388,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;
 }
@@ -410,11 +408,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;
 }
@@ -432,9 +430,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;
@@ -453,10 +451,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;
@@ -479,4 +477,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/crmf.h b/include/internal/crmf.h
index 9e37320d8330..e5f918d8e679 100644
--- a/include/internal/crmf.h
+++ b/include/internal/crmf.h
@@ -7,10 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_CRYPTO_CRMF_H
-# define OSSL_CRYPTO_CRMF_H
-# pragma once
+#define OSSL_CRYPTO_CRMF_H
+#pragma once
 
-# include <openssl/crmf.h>
+#include <openssl/crmf.h>
 
 struct ossl_crmf_attributetypeandvalue_st {
     ASN1_OBJECT *type;
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index da442f8a86f7..50aec7e7f4fe 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -8,23 +8,23 @@
  */
 
 #ifndef OSSL_INTERNAL_CRYPTLIB_H
-# define OSSL_INTERNAL_CRYPTLIB_H
-# pragma once
+#define OSSL_INTERNAL_CRYPTLIB_H
+#pragma once
 
-# 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 "internal/common.h"
+#include "internal/common.h"
 
-# include <openssl/crypto.h>
-# include <openssl/buffer.h>
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/err.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/err.h>
 
 typedef struct ex_callback_st EX_CALLBACK;
 DEFINE_STACK_OF(EX_CALLBACK)
@@ -33,10 +33,8 @@ typedef struct mem_st MEM;
 DEFINE_LHASH_OF_EX(MEM);
 
 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)
-#  define OPENSSL_IA32CAP_P_MAX_INDEXES 10
+#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
+#define OPENSSL_IA32CAP_P_MAX_INDEXES 10
 extern unsigned int OPENSSL_ia32cap_P[];
 #endif
 
@@ -50,11 +48,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);
@@ -67,9 +65,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;
@@ -90,37 +88,37 @@ typedef struct ossl_ex_data_global_st {
 
 /* 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_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
 /* slot 7 unused, was CRNG test data and can be reused */
-# 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_THREAD_INDEX                  19
-# define OSSL_LIB_CTX_DECODER_CACHE_INDEX           20
-# define OSSL_LIB_CTX_COMP_METHODS                  21
-# define OSSL_LIB_CTX_INDICATOR_CB_INDEX            22
-# define OSSL_LIB_CTX_MAX_INDEXES                   22
+#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_THREAD_INDEX 19
+#define OSSL_LIB_CTX_DECODER_CACHE_INDEX 20
+#define OSSL_LIB_CTX_COMP_METHODS 21
+#define OSSL_LIB_CTX_INDICATOR_CB_INDEX 22
+#define OSSL_LIB_CTX_MAX_INDEXES 22
 
 OSSL_LIB_CTX *ossl_lib_ctx_get_concrete(OSSL_LIB_CTX *ctx);
 int ossl_lib_ctx_is_default(OSSL_LIB_CTX *ctx);
@@ -137,32 +135,32 @@ CRYPTO_THREAD_LOCAL *ossl_lib_ctx_get_rcukey(OSSL_LIB_CTX *libctx);
 
 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);
 
 /**
  *  Writes |n| value in hex format into |buf|,
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 8d6db8f06625..fe2d462caa9f 100644
--- a/include/internal/der.h
+++ b/include/internal/der.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_INTERNAL_DER_H
-# define OSSL_INTERNAL_DER_H
-# pragma once
+#define OSSL_INTERNAL_DER_H
+#pragma once
 
-# include <openssl/bn.h>
-# include "internal/packet.h"
+#include <openssl/bn.h>
+#include "internal/packet.h"
 
 /*
  * NOTE: X.690 numbers the identifier octet bits 1 to 8.
@@ -26,42 +26,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.
@@ -71,18 +71,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/deterministic_nonce.h b/include/internal/deterministic_nonce.h
index 5f0313fe3842..556853045937 100644
--- a/include/internal/deterministic_nonce.h
+++ b/include/internal/deterministic_nonce.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_INTERNAL_DETERMINISTIC_NONCE_H
-# define OSSL_INTERNAL_DETERMINISTIC_NONCE_H
-# pragma once
+#define OSSL_INTERNAL_DETERMINISTIC_NONCE_H
+#pragma once
 
-# include <openssl/bn.h>
+#include <openssl/bn.h>
 
 int ossl_gen_deterministic_nonce_rfc6979(BIGNUM *out, const BIGNUM *q,
-                                         const BIGNUM *priv,
-                                         const unsigned char *message,
-                                         size_t message_len,
-                                         const char *digestname,
-                                         OSSL_LIB_CTX *libctx,
-                                         const char *propq);
+    const BIGNUM *priv,
+    const unsigned char *message,
+    size_t message_len,
+    const char *digestname,
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 #endif /*OSSL_INTERNAL_DETERMINISTIC_NONCE_H */
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/e_os.h b/include/internal/e_os.h
index 8419f7143669..d287d910554b 100644
--- a/include/internal/e_os.h
+++ b/include/internal/e_os.h
@@ -8,243 +8,243 @@
  */
 
 #ifndef OSSL_E_OS_H
-# define OSSL_E_OS_H
+#define OSSL_E_OS_H
 
-# include <limits.h>
-# include <openssl/opensslconf.h>
+#include <limits.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/e_os2.h>
-# include <openssl/crypto.h>
-# include "internal/numbers.h"   /* Ensure the definition of SIZE_MAX */
+#include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+#include "internal/numbers.h" /* Ensure the definition of SIZE_MAX */
 
 /*
  * <openssl/e_os2.h> contains what we can justify to make visible to the
  * outside; this file e_os.h is not part of the exported interface.
  */
 
-# if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
-#  define NO_CHMOD
-#  define NO_SYSLOG
-# endif
+#if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
+#define NO_CHMOD
+#define NO_SYSLOG
+#endif
 
-# define get_last_sys_error()    errno
-# define clear_sys_error()       errno=0
-# define set_sys_error(e)        errno=(e)
+#define get_last_sys_error() errno
+#define clear_sys_error() errno = 0
+#define set_sys_error(e) errno = (e)
 
 /********************************************************************
  The Microsoft section
  ********************************************************************/
-# if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
-#  define WIN32
-# endif
-# if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-# endif
-# if defined(OPENSSL_SYS_MSDOS) && !defined(MSDOS)
-#  define MSDOS
-# endif
+#if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
+#define WIN32
+#endif
+#if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS)
+#define WINDOWS
+#endif
+#if defined(OPENSSL_SYS_MSDOS) && !defined(MSDOS)
+#define MSDOS
+#endif
 
-# ifdef WIN32
-#  undef get_last_sys_error
-#  undef clear_sys_error
-#  undef set_sys_error
-#  define get_last_sys_error()    GetLastError()
-#  define clear_sys_error()       SetLastError(0)
-#  define set_sys_error(e)        SetLastError(e)
-#  if !defined(WINNT)
-#   define WIN_CONSOLE_BUG
-#  endif
-# else
-# endif
+#ifdef WIN32
+#undef get_last_sys_error
+#undef clear_sys_error
+#undef set_sys_error
+#define get_last_sys_error() GetLastError()
+#define clear_sys_error() SetLastError(0)
+#define set_sys_error(e) SetLastError(e)
+#if !defined(WINNT)
+#define WIN_CONSOLE_BUG
+#endif
+#else
+#endif
 
-# if (defined(WINDOWS) || defined(MSDOS))
+#if (defined(WINDOWS) || defined(MSDOS))
 
-#  ifdef __DJGPP__
-#   include <unistd.h>
-#   include <sys/stat.h>
-#   define _setmode setmode
-#   define _O_TEXT O_TEXT
-#   define _O_BINARY O_BINARY
-#   undef DEVRANDOM_EGD  /*  Neither MS-DOS nor FreeDOS provide 'egd' sockets.  */
-#   undef DEVRANDOM
-#   define DEVRANDOM "/dev/urandom\x24"
-#  endif                        /* __DJGPP__ */
+#ifdef __DJGPP__
+#include <unistd.h>
+#include <sys/stat.h>
+#define _setmode setmode
+#define _O_TEXT O_TEXT
+#define _O_BINARY O_BINARY
+#undef DEVRANDOM_EGD /*  Neither MS-DOS nor FreeDOS provide 'egd' sockets.  */
+#undef DEVRANDOM
+#define DEVRANDOM "/dev/urandom\x24"
+#endif /* __DJGPP__ */
 
-#  ifndef S_IFDIR
-#   define S_IFDIR     _S_IFDIR
-#  endif
+#ifndef S_IFDIR
+#define S_IFDIR _S_IFDIR
+#endif
 
-#  ifndef S_IFMT
-#   define S_IFMT      _S_IFMT
-#  endif
+#ifndef S_IFMT
+#define S_IFMT _S_IFMT
+#endif
 
-#  if !defined(WINNT) && !defined(__DJGPP__)
-#   define NO_SYSLOG
-#  endif
+#if !defined(WINNT) && !defined(__DJGPP__)
+#define NO_SYSLOG
+#endif
 
-#  ifdef WINDOWS
-#   if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
-       /*
-        * Defining _WIN32_WINNT here in e_os.h implies certain "discipline."
-        * Most notably we ought to check for availability of each specific
-        * routine that was introduced after denoted _WIN32_WINNT with
-        * GetProcAddress(). Normally newer functions are masked with higher
-        * _WIN32_WINNT in SDK headers. So that if you wish to use them in
-        * some module, you'd need to override _WIN32_WINNT definition in
-        * the target module in order to "reach for" prototypes, but replace
-        * calls to new functions with indirect calls. Alternatively it
-        * might be possible to achieve the goal by /DELAYLOAD-ing .DLLs
-        * and check for current OS version instead.
-        */
-#    define _WIN32_WINNT 0x0501
-#   endif
-#   include <windows.h>
-#   include <stdio.h>
-#   include <stddef.h>
-#   include <errno.h>
-#   if defined(_WIN32_WCE) && !defined(EACCES)
-#    define EACCES   13
-#   endif
-#   include <string.h>
-#   include <malloc.h>
-#   if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
-#    if _MSC_VER>=1300 && _MSC_VER<1600
-#     undef stdin
-#     undef stdout
-#     undef stderr
+#ifdef WINDOWS
+#if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
+/*
+ * Defining _WIN32_WINNT here in e_os.h implies certain "discipline."
+ * Most notably we ought to check for availability of each specific
+ * routine that was introduced after denoted _WIN32_WINNT with
+ * GetProcAddress(). Normally newer functions are masked with higher
+ * _WIN32_WINNT in SDK headers. So that if you wish to use them in
+ * some module, you'd need to override _WIN32_WINNT definition in
+ * the target module in order to "reach for" prototypes, but replace
+ * calls to new functions with indirect calls. Alternatively it
+ * might be possible to achieve the goal by /DELAYLOAD-ing .DLLs
+ * and check for current OS version instead.
+ */
+#define _WIN32_WINNT 0x0501
+#endif
+#include <windows.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <errno.h>
+#if defined(_WIN32_WCE) && !defined(EACCES)
+#define EACCES 13
+#endif
+#include <string.h>
+#include <malloc.h>
+#if defined(_MSC_VER) && !defined(_WIN32_WCE) && !defined(_DLL) && defined(stdin)
+#if _MSC_VER >= 1300 && _MSC_VER < 1600
+#undef stdin
+#undef stdout
+#undef stderr
 FILE *__iob_func(void);
-#     define stdin  (&__iob_func()[0])
-#     define stdout (&__iob_func()[1])
-#     define stderr (&__iob_func()[2])
-#    endif
-#   endif
-#  endif
+#define stdin (&__iob_func()[0])
+#define stdout (&__iob_func()[1])
+#define stderr (&__iob_func()[2])
+#endif
+#endif
+#endif
 
-#  include <io.h>
-#  include <fcntl.h>
+#include <io.h>
+#include <fcntl.h>
 
-#  ifdef OPENSSL_SYS_WINCE
-#   define OPENSSL_NO_POSIX_IO
-#  endif
+#ifdef OPENSSL_SYS_WINCE
+#define OPENSSL_NO_POSIX_IO
+#endif
 
-#  define EXIT(n) exit(n)
-#  define LIST_SEPARATOR_CHAR ';'
-#  ifndef W_OK
-#   define W_OK        2
-#  endif
-#  ifndef R_OK
-#   define R_OK        4
-#  endif
-#  ifdef OPENSSL_SYS_WINCE
-#   define DEFAULT_HOME  ""
-#  else
-#   define DEFAULT_HOME  "C:"
-#  endif
+#define EXIT(n) exit(n)
+#define LIST_SEPARATOR_CHAR ';'
+#ifndef W_OK
+#define W_OK 2
+#endif
+#ifndef R_OK
+#define R_OK 4
+#endif
+#ifdef OPENSSL_SYS_WINCE
+#define DEFAULT_HOME ""
+#else
+#define DEFAULT_HOME "C:"
+#endif
 
 /* Avoid Visual Studio 13 GetVersion deprecated problems */
-#  if defined(_MSC_VER) && _MSC_VER>=1800
-#   define check_winnt() (1)
-#   define check_win_minplat(x) (1)
-#  else
-#   define check_winnt() (GetVersion() < 0x80000000)
-#   define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
-#  endif
+#if defined(_MSC_VER) && _MSC_VER >= 1800
+#define check_winnt() (1)
+#define check_win_minplat(x) (1)
+#else
+#define check_winnt() (GetVersion() < 0x80000000)
+#define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
+#endif
 
-# else                          /* The non-microsoft world */
+#else /* The non-microsoft world */
 
-#  if defined(OPENSSL_SYS_VXWORKS)
-#   include <time.h>
-#  else
-#   include <sys/time.h>
-#  endif
+#if defined(OPENSSL_SYS_VXWORKS)
+#include <time.h>
+#else
+#include <sys/time.h>
+#endif
 
-#  ifdef OPENSSL_SYS_VMS
-#   define VMS 1
-  /*
-   * some programs don't include stdlib, so exit() and others give implicit
-   * function warnings
-   */
-#   include <stdlib.h>
-#   if defined(__DECC)
-#    include <unistd.h>
-#   else
-#    include <unixlib.h>
-#   endif
-#   define LIST_SEPARATOR_CHAR ','
-  /* We don't have any well-defined random devices on VMS, yet... */
-#   undef DEVRANDOM
-  /*-
-     We need to do this since VMS has the following coding on status codes:
+#ifdef OPENSSL_SYS_VMS
+#define VMS 1
+/*
+ * some programs don't include stdlib, so exit() and others give implicit
+ * function warnings
+ */
+#include <stdlib.h>
+#if defined(__DECC)
+#include <unistd.h>
+#else
+#include <unixlib.h>
+#endif
+#define LIST_SEPARATOR_CHAR ','
+/* We don't have any well-defined random devices on VMS, yet... */
+#undef DEVRANDOM
+/*-
+   We need to do this since VMS has the following coding on status codes:
 
-     Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
-               The important thing to know is that odd numbers are considered
-               good, while even ones are considered errors.
-     Bits 3-15: actual status number
-     Bits 16-27: facility number.  0 is considered "unknown"
-     Bits 28-31: control bits.  If bit 28 is set, the shell won't try to
-                 output the message (which, for random codes, just looks ugly)
+   Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
+             The important thing to know is that odd numbers are considered
+             good, while even ones are considered errors.
+   Bits 3-15: actual status number
+   Bits 16-27: facility number.  0 is considered "unknown"
+   Bits 28-31: control bits.  If bit 28 is set, the shell won't try to
+               output the message (which, for random codes, just looks ugly)
 
-     So, what we do here is to change 0 to 1 to get the default success status,
-     and everything else is shifted up to fit into the status number field, and
-     the status is tagged as an error, which is what is wanted here.
+   So, what we do here is to change 0 to 1 to get the default success status,
+   and everything else is shifted up to fit into the status number field, and
+   the status is tagged as an error, which is what is wanted here.
 
-     Finally, we add the VMS C facility code 0x35a000, because there are some
-     programs, such as Perl, that will reinterpret the code back to something
-     POSIX.  'man perlvms' explains it further.
+   Finally, we add the VMS C facility code 0x35a000, because there are some
+   programs, such as Perl, that will reinterpret the code back to something
+   POSIX.  'man perlvms' explains it further.
 
-     NOTE: the perlvms manual wants to turn all codes 2 to 255 into success
-     codes (status type = 1).  I couldn't disagree more.  Fortunately, the
-     status type doesn't seem to bother Perl.
-     -- Richard Levitte
-  */
-#   define EXIT(n)  exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1)
+   NOTE: the perlvms manual wants to turn all codes 2 to 255 into success
+   codes (status type = 1).  I couldn't disagree more.  Fortunately, the
+   status type doesn't seem to bother Perl.
+   -- Richard Levitte
+*/
+#define EXIT(n) exit((n) ? (((n) << 3) | 2 | 0x10000000 | 0x35a000) : 1)
 
-#   define DEFAULT_HOME "SYS$LOGIN:"
+#define DEFAULT_HOME "SYS$LOGIN:"
 
-#  else
-     /* !defined VMS */
-#   include <unistd.h>
-#   include <sys/types.h>
-#   ifdef OPENSSL_SYS_WIN32_CYGWIN
-#    include <io.h>
-#    include <fcntl.h>
-#   endif
+#else
+/* !defined VMS */
+#include <unistd.h>
+#include <sys/types.h>
+#ifdef OPENSSL_SYS_WIN32_CYGWIN
+#include <io.h>
+#include <fcntl.h>
+#endif
 
-#   define LIST_SEPARATOR_CHAR ':'
-#   define EXIT(n)             exit(n)
-#  endif
+#define LIST_SEPARATOR_CHAR ':'
+#define EXIT(n) exit(n)
+#endif
 
-# endif
+#endif
 
 /***********************************************/
 
-# if defined(OPENSSL_SYS_WINDOWS)
-#  if defined(_MSC_VER) && (_MSC_VER >= 1310) && !defined(_WIN32_WCE)
-#   define open _open
-#   define fdopen _fdopen
-#   define close _close
-#   ifndef strdup
-#    define strdup _strdup
-#   endif
-#   define unlink _unlink
-#   define fileno _fileno
-#   define isatty _isatty
-#  endif
-# else
-#  include <strings.h>
-# endif
+#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(_MSC_VER) && (_MSC_VER >= 1310) && !defined(_WIN32_WCE)
+#define open _open
+#define fdopen _fdopen
+#define close _close
+#ifndef strdup
+#define strdup _strdup
+#endif
+#define unlink _unlink
+#define fileno _fileno
+#define isatty _isatty
+#endif
+#else
+#include <strings.h>
+#endif
 
 /* vxworks */
-# if defined(OPENSSL_SYS_VXWORKS)
-#  include <ioLib.h>
-#  include <tickLib.h>
-#  include <sysLib.h>
-#  include <vxWorks.h>
-#  include <sockLib.h>
-#  include <taskLib.h>
+#if defined(OPENSSL_SYS_VXWORKS)
+#include <ioLib.h>
+#include <tickLib.h>
+#include <sysLib.h>
+#include <vxWorks.h>
+#include <sockLib.h>
+#include <taskLib.h>
 
-#  define TTY_STRUCT int
-#  define sleep(a) taskDelay((a) * sysClkRateGet())
+#define TTY_STRUCT int
+#define sleep(a) taskDelay((a) * sysClkRateGet())
 
 /*
  * NOTE: these are implemented by helpers in database app! if the database is
@@ -254,54 +254,54 @@ struct hostent *gethostbyname(const char *name);
 struct hostent *gethostbyaddr(const char *addr, int length, int type);
 struct servent *getservbyname(const char *name, const char *proto);
 
-# endif
+#endif
 /* end vxworks */
 
 /* ----------------------------- HP NonStop -------------------------------- */
 /* Required to support platform variant without getpid() and pid_t. */
-# if defined(__TANDEM) && defined(_GUARDIAN_TARGET)
-#  include <strings.h>
-#  include <netdb.h>
-#  define getservbyname(name,proto)          getservbyname((char*)name,proto)
-#  define gethostbyname(name)                gethostbyname((char*)name)
-#  define ioctlsocket(a,b,c)	ioctl(a,b,c)
-#  ifdef NO_GETPID
+#if defined(__TANDEM) && defined(_GUARDIAN_TARGET)
+#include <strings.h>
+#include <netdb.h>
+#define getservbyname(name, proto) getservbyname((char *)name, proto)
+#define gethostbyname(name) gethostbyname((char *)name)
+#define ioctlsocket(a, b, c) ioctl(a, b, c)
+#ifdef NO_GETPID
 inline int nssgetpid(void);
-#   ifndef NSSGETPID_MACRO
-#    define NSSGETPID_MACRO
-#    include <cextdecs.h(PROCESSHANDLE_GETMINE_)>
-#    include <cextdecs.h(PROCESSHANDLE_DECOMPOSE_)>
-       inline int nssgetpid(void)
-       {
-         short phandle[10]={0};
-         union pseudo_pid {
-          struct {
-           short cpu;
-           short pin;
-         } cpu_pin ;
-         int ppid;
-        } ppid = { 0 };
-        PROCESSHANDLE_GETMINE_(phandle);
-        PROCESSHANDLE_DECOMPOSE_(phandle, &ppid.cpu_pin.cpu, &ppid.cpu_pin.pin);
-        return ppid.ppid;
-       }
-#    define getpid(a) nssgetpid(a)
-#   endif /* NSSGETPID_MACRO */
-#  endif /* NO_GETPID */
+#ifndef NSSGETPID_MACRO
+#define NSSGETPID_MACRO
+#include <cextdecs.h(PROCESSHANDLE_GETMINE_)>
+#include <cextdecs.h(PROCESSHANDLE_DECOMPOSE_)>
+inline int nssgetpid(void)
+{
+    short phandle[10] = { 0 };
+    union pseudo_pid {
+        struct {
+            short cpu;
+            short pin;
+        } cpu_pin;
+        int ppid;
+    } ppid = { 0 };
+    PROCESSHANDLE_GETMINE_(phandle);
+    PROCESSHANDLE_DECOMPOSE_(phandle, &ppid.cpu_pin.cpu, &ppid.cpu_pin.pin);
+    return ppid.ppid;
+}
+#define getpid(a) nssgetpid(a)
+#endif /* NSSGETPID_MACRO */
+#endif /* NO_GETPID */
 /*#  define setsockopt(a,b,c,d,f) setsockopt(a,b,c,(char*)d,f)*/
 /*#  define getsockopt(a,b,c,d,f) getsockopt(a,b,c,(char*)d,f)*/
 /*#  define connect(a,b,c) connect(a,(struct sockaddr *)b,c)*/
 /*#  define bind(a,b,c) bind(a,(struct sockaddr *)b,c)*/
 /*#  define sendto(a,b,c,d,e,f) sendto(a,(char*)b,c,d,(struct sockaddr *)e,f)*/
-#  if defined(OPENSSL_THREADS) && !defined(_PUT_MODEL_)
-  /*
-   * HPNS SPT threads
-   */
-#   define  SPT_THREAD_SIGNAL 1
-#   define  SPT_THREAD_AWARE 1
-#   include <spthread.h>
-#   undef close
-#   define close spt_close
+#if defined(OPENSSL_THREADS) && !defined(_PUT_MODEL_)
+/*
+ * HPNS SPT threads
+ */
+#define SPT_THREAD_SIGNAL 1
+#define SPT_THREAD_AWARE 1
+#include <spthread.h>
+#undef close
+#define close spt_close
 /*
 #   define get_last_socket_error()	errno
 #   define clear_socket_error()	errno=0
@@ -310,27 +310,27 @@ inline int nssgetpid(void);
 #   define readsocket(s,b,n)	read((s),(char*)(b),(n))
 #   define writesocket(s,b,n)	write((s),(char*)(b),(n)
 */
-#   define accept(a,b,c)        accept(a,(struct sockaddr *)b,c)
-#   define recvfrom(a,b,c,d,e,f) recvfrom(a,b,(socklen_t)c,d,e,f)
-#  endif
-# endif
+#define accept(a, b, c) accept(a, (struct sockaddr *)b, c)
+#define recvfrom(a, b, c, d, e, f) recvfrom(a, b, (socklen_t)c, d, e, f)
+#endif
+#endif
 
-# ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
-#  define CRYPTO_memcmp memcmp
-# endif
+#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#define CRYPTO_memcmp memcmp
+#endif
 
-# ifndef OPENSSL_NO_SECURE_MEMORY
-   /* unistd.h defines _POSIX_VERSION */
-#  if (defined(OPENSSL_SYS_UNIX) \
-        && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L)      \
-             || defined(__sun) || defined(__hpux) || defined(__sgi)      \
-             || defined(__osf__) )) \
-      || defined(_WIN32)
-      /* secure memory is implemented */
-#   else
-#     define OPENSSL_NO_SECURE_MEMORY
-#   endif
-# endif
+#ifndef OPENSSL_NO_SECURE_MEMORY
+/* unistd.h defines _POSIX_VERSION */
+#if (defined(OPENSSL_SYS_UNIX)                                 \
+    && ((defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
+        || defined(__sun) || defined(__hpux) || defined(__sgi) \
+        || defined(__osf__)))                                  \
+    || defined(_WIN32)
+/* secure memory is implemented */
+#else
+#define OPENSSL_NO_SECURE_MEMORY
+#endif
+#endif
 
 /*
  * str[n]casecmp_l is defined in POSIX 2008-01. Value is taken accordingly
@@ -338,18 +338,18 @@ inline int nssgetpid(void);
  * There are also equivalent functions on Windows.
  * There is no locale_t on NONSTOP.
  */
-# if defined(OPENSSL_SYS_WINDOWS)
-#  define locale_t _locale_t
-#  define freelocale _free_locale
-#  define strcasecmp_l _stricmp_l
-#  define strncasecmp_l _strnicmp_l
-#  define strcasecmp _stricmp
-#  define strncasecmp _strnicmp
-# elif !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 200809L \
-     || defined(OPENSSL_SYS_TANDEM)
-#  ifndef OPENSSL_NO_LOCALE
-#   define OPENSSL_NO_LOCALE
-#  endif
-# endif
+#if defined(OPENSSL_SYS_WINDOWS)
+#define locale_t _locale_t
+#define freelocale _free_locale
+#define strcasecmp_l _stricmp_l
+#define strncasecmp_l _strnicmp_l
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#elif !defined(_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 200809L \
+    || defined(OPENSSL_SYS_TANDEM)
+#ifndef OPENSSL_NO_LOCALE
+#define OPENSSL_NO_LOCALE
+#endif
+#endif
 
 #endif
diff --git a/include/internal/e_winsock.h b/include/internal/e_winsock.h
index 72a38a529f5b..c2a08ebed1a1 100644
--- a/include/internal/e_winsock.h
+++ b/include/internal/e_winsock.h
@@ -8,45 +8,45 @@
  */
 
 #ifndef OSSL_E_WINSOCK_H
-# define OSSL_E_WINSOCK_H
-# pragma once
+#define OSSL_E_WINSOCK_H
+#pragma once
 
-# ifdef WINDOWS
-#  if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
-      /*
-       * Defining _WIN32_WINNT here in e_winsock.h implies certain "discipline."
-       * Most notably we ought to check for availability of each specific
-       * routine that was introduced after denoted _WIN32_WINNT with
-       * GetProcAddress(). Normally newer functions are masked with higher
-       * _WIN32_WINNT in SDK headers. So that if you wish to use them in
-       * some module, you'd need to override _WIN32_WINNT definition in
-       * the target module in order to "reach for" prototypes, but replace
-       * calls to new functions with indirect calls. Alternatively it
-       * might be possible to achieve the goal by /DELAYLOAD-ing .DLLs
-       * and check for current OS version instead.
-       */
-#   define _WIN32_WINNT 0x0501
-#  endif
-#  if defined(_WIN32_WINNT) || defined(_WIN32_WCE)
-      /*
-       * Just like defining _WIN32_WINNT including winsock2.h implies
-       * certain "discipline" for maintaining [broad] binary compatibility.
-       * As long as structures are invariant among Winsock versions,
-       * it's sufficient to check for specific Winsock2 API availability
-       * at run-time [DSO_global_lookup is recommended]...
-       */
-#   include <winsock2.h>
-#   include <ws2tcpip.h>
-      /*
-       * Clang-based C++Builder 10.3.3 toolchains cannot find C inline
-       * definitions at link-time.  This header defines WspiapiLoad() as an
-       * __inline function.  https://quality.embarcadero.com/browse/RSP-33806
-       */
-#   if !defined(__BORLANDC__) || !defined(__clang__)
-#    include <wspiapi.h>
-#   endif
-      /* yes, they have to be #included prior to <windows.h> */
-#  endif
-#  include <windows.h>
-# endif
+#ifdef WINDOWS
+#if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
+/*
+ * Defining _WIN32_WINNT here in e_winsock.h implies certain "discipline."
+ * Most notably we ought to check for availability of each specific
+ * routine that was introduced after denoted _WIN32_WINNT with
+ * GetProcAddress(). Normally newer functions are masked with higher
+ * _WIN32_WINNT in SDK headers. So that if you wish to use them in
+ * some module, you'd need to override _WIN32_WINNT definition in
+ * the target module in order to "reach for" prototypes, but replace
+ * calls to new functions with indirect calls. Alternatively it
+ * might be possible to achieve the goal by /DELAYLOAD-ing .DLLs
+ * and check for current OS version instead.
+ */
+#define _WIN32_WINNT 0x0501
+#endif
+#if defined(_WIN32_WINNT) || defined(_WIN32_WCE)
+/*
+ * Just like defining _WIN32_WINNT including winsock2.h implies
+ * certain "discipline" for maintaining [broad] binary compatibility.
+ * As long as structures are invariant among Winsock versions,
+ * it's sufficient to check for specific Winsock2 API availability
+ * at run-time [DSO_global_lookup is recommended]...
+ */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+/*
+ * Clang-based C++Builder 10.3.3 toolchains cannot find C inline
+ * definitions at link-time.  This header defines WspiapiLoad() as an
+ * __inline function.  https://quality.embarcadero.com/browse/RSP-33806
+ */
+#if !defined(__BORLANDC__) || !defined(__clang__)
+#include <wspiapi.h>
+#endif
+/* yes, they have to be #included prior to <windows.h> */
+#endif
+#include <windows.h>
+#endif
 #endif /* !(OSSL_E_WINSOCK_H) */
diff --git a/include/internal/encoder.h b/include/internal/encoder.h
index d7ad2097f459..239f4c3e7fec 100644
--- a/include/internal/encoder.h
+++ b/include/internal/encoder.h
@@ -8,20 +8,20 @@
  */
 
 #ifndef OSSL_INTERNAL_ENCODER_H
-# define OSSL_INTERNAL_ENCODER_H
-# pragma once
+#define OSSL_INTERNAL_ENCODER_H
+#pragma once
 
-# include <openssl/bio.h>
-# include <openssl/buffer.h>
-# include <openssl/types.h>
-# include "internal/ffc.h"
+#include <openssl/bio.h>
+#include <openssl/buffer.h>
+#include <openssl/types.h>
+#include "internal/ffc.h"
 
 int ossl_bio_print_labeled_bignum(BIO *out, const char *label,
-                                  const BIGNUM *bn);
+    const BIGNUM *bn);
 int ossl_bio_print_labeled_buf(BIO *out, const char *label,
-                               const unsigned char *buf, size_t buflen);
-# if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_DSA)
+    const unsigned char *buf, size_t buflen);
+#if !defined(OPENSSL_NO_DH) || !defined(OPENSSL_NO_DSA)
 int ossl_bio_print_ffc_params(BIO *out, const FFC_PARAMS *ffc);
-# endif
+#endif
 
 #endif
diff --git a/include/internal/endian.h b/include/internal/endian.h
index 7d5a73b1bb1f..51c10873cd3c 100644
--- a/include/internal/endian.h
+++ b/include/internal/endian.h
@@ -8,8 +8,8 @@
  */
 
 #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 endianness
@@ -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 edd8381e8df4..fd56b07e94bf 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);
 void 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/fips.h b/include/internal/fips.h
index 3f70c0de93c5..2e02ff77b7b4 100644
--- a/include/internal/fips.h
+++ b/include/internal/fips.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_INTERNAL_FIPS_H
-# define OSSL_INTERNAL_FIPS_H
-# pragma once
+#define OSSL_INTERNAL_FIPS_H
+#pragma once
 
-# ifdef FIPS_MODULE
+#ifdef FIPS_MODULE
 
 /* Return 1 if the FIPS self tests are running and 0 otherwise */
 int ossl_fips_self_testing(void);
 
-# endif /* FIPS_MODULE */
+#endif /* FIPS_MODULE */
 
 #endif
diff --git a/include/internal/hashfunc.h b/include/internal/hashfunc.h
index fae8a275fa2e..78d7c859d59d 100644
--- a/include/internal/hashfunc.h
+++ b/include/internal/hashfunc.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OPENSSL_HASHFUNC_H
-# define OPENSSL_HASHFUNC_H
+#define OPENSSL_HASHFUNC_H
 
-# include <openssl/e_os2.h>
-# include <stddef.h>
+#include <openssl/e_os2.h>
+#include <stddef.h>
 /**
  * Generalized fnv1a 64 bit hash function
  */
diff --git a/include/internal/hashtable.h b/include/internal/hashtable.h
index ccbc470db722..bc44e43678a3 100644
--- a/include/internal/hashtable.h
+++ b/include/internal/hashtable.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OPENSSL_HASHTABLE_H
-# define OPENSSL_HASHTABLE_H
-# pragma once
+#define OPENSSL_HASHTABLE_H
+#pragma once
 
 #include <stddef.h>
 #include <stdint.h>
@@ -72,16 +72,18 @@ typedef struct ht_config_st {
  * Starts the definition of a hash table key
  */
 #define HT_START_KEY_DEFN(keyname) \
-typedef struct keyname##_st { \
-    HT_KEY key_header; \
-    struct {
+    typedef struct keyname##_st {  \
+        HT_KEY key_header;         \
+        struct {
 
 /*
  * Ends a hash table key definitions
  */
 #define HT_END_KEY_DEFN(keyname) \
-    } keyfields; \
-} keyname;
+    }                            \
+    keyfields;                   \
+    }                            \
+    keyname;
 
 /*
  * Defines a field in a hash table key
@@ -93,7 +95,7 @@ typedef struct keyname##_st { \
  * array field in a hash table key
  */
 #define HT_DEF_KEY_FIELD_CHAR_ARRAY(name, size) \
-     HT_DEF_KEY_FIELD(name[size], char)
+    HT_DEF_KEY_FIELD(name[size], char)
 
 /*
  * Defines a uint8_t (blob) field in a hash table key
@@ -104,11 +106,12 @@ typedef struct keyname##_st { \
 /*
  * Initializes a key
  */
-#define HT_INIT_KEY(key) do { \
-memset((key), 0, sizeof(*(key))); \
-(key)->key_header.keysize = (sizeof(*(key)) - sizeof(HT_KEY)); \
-(key)->key_header.keybuf = (((uint8_t *)key) + sizeof(HT_KEY)); \
-} while(0)
+#define HT_INIT_KEY(key)                                                \
+    do {                                                                \
+        memset((key), 0, sizeof(*(key)));                               \
+        (key)->key_header.keysize = (sizeof(*(key)) - sizeof(HT_KEY));  \
+        (key)->key_header.keybuf = (((uint8_t *)key) + sizeof(HT_KEY)); \
+    } while (0)
 
 /*
  * Resets a hash table key to a known state
@@ -124,10 +127,11 @@ memset((key), 0, sizeof(*(key))); \
  * Sets a string field in a hash table key, preserving
  * null terminator
  */
-#define HT_SET_KEY_STRING(key, member, value) do { \
-    if ((value) != NULL) \
-        strncpy((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
-} while(0)
+#define HT_SET_KEY_STRING(key, member, value)                                             \
+    do {                                                                                  \
+        if ((value) != NULL)                                                              \
+            strncpy((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
+    } while (0)
 
 /*
  * This is the same as HT_SET_KEY_STRING, except that it uses
@@ -135,37 +139,41 @@ memset((key), 0, sizeof(*(key))); \
  * This is useful for instances in which we want upper and lower case
  * key value to hash to the same entry
  */
-#define HT_SET_KEY_STRING_CASE(key, member, value) do { \
-   ossl_ht_strcase((key)->keyfields.member, value, sizeof((key)->keyfields.member) -1); \
-} while(0)
+#define HT_SET_KEY_STRING_CASE(key, member, value)                                            \
+    do {                                                                                      \
+        ossl_ht_strcase((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
+    } while (0)
 
 /*
  * Same as HT_SET_KEY_STRING but also takes length of the string.
  */
-#define HT_SET_KEY_STRING_N(key, member, value, len) do { \
-    if ((value) != NULL) { \
-        if (len < sizeof((key)->keyfields.member)) \
-            strncpy((key)->keyfields.member, value, len); \
-        else \
-            strncpy((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
-    } \
-} while(0)
+#define HT_SET_KEY_STRING_N(key, member, value, len)                                          \
+    do {                                                                                      \
+        if ((value) != NULL) {                                                                \
+            if (len < sizeof((key)->keyfields.member))                                        \
+                strncpy((key)->keyfields.member, value, len);                                 \
+            else                                                                              \
+                strncpy((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
+        }                                                                                     \
+    } while (0)
 
 /* Same as HT_SET_KEY_STRING_CASE but also takes length of the string. */
-#define HT_SET_KEY_STRING_CASE_N(key, member, value, len) do { \
-    if (len < sizeof((key)->keyfields.member)) \
-        ossl_ht_strcase((key)->keyfields.member, value, len); \
-    else \
-        ossl_ht_strcase((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
-} while(0)
+#define HT_SET_KEY_STRING_CASE_N(key, member, value, len)                                         \
+    do {                                                                                          \
+        if (len < sizeof((key)->keyfields.member))                                                \
+            ossl_ht_strcase((key)->keyfields.member, value, len);                                 \
+        else                                                                                      \
+            ossl_ht_strcase((key)->keyfields.member, value, sizeof((key)->keyfields.member) - 1); \
+    } while (0)
 
 /*
  * Sets a uint8_t (blob) field in a hash table key
  */
-#define HT_SET_KEY_BLOB(key, member, value, len) do { \
-    if (value != NULL) \
-        memcpy((key)->keyfields.member, value, len); \
-} while(0)
+#define HT_SET_KEY_BLOB(key, member, value, len)         \
+    do {                                                 \
+        if (value != NULL)                               \
+            memcpy((key)->keyfields.member, value, len); \
+    } while (0)
 
 /*
  * Converts a defined key type to an HT_KEY
@@ -186,67 +194,68 @@ memset((key), 0, sizeof(*(key))); \
  * ossl_ht_NAME_TYPE_to_value - converts a TYPE to an HT_VALUE
  * ossl_ht_NAME_TYPE_type - boolean to detect if a value is of TYPE
  */
-#define IMPLEMENT_HT_VALUE_TYPE_FNS(vtype, name, pfx) \
-static uintptr_t name##_##vtype##_id = 0; \
-pfx ossl_unused int ossl_ht_##name##_##vtype##_insert(HT *h, HT_KEY *key,      \
-                                                      vtype *data,             \
-                                                      vtype **olddata) {       \
-    HT_VALUE inval;                                                            \
-    HT_VALUE *oval = NULL;                                                     \
-    int rc;                                                                    \
+#define IMPLEMENT_HT_VALUE_TYPE_FNS(vtype, name, pfx)                          \
+    static uintptr_t name##_##vtype##_id = 0;                                  \
+    pfx ossl_unused int ossl_ht_##name##_##vtype##_insert(HT *h, HT_KEY *key,  \
+        vtype *data,                                                           \
+        vtype **olddata)                                                       \
+    {                                                                          \
+        HT_VALUE inval;                                                        \
+        HT_VALUE *oval = NULL;                                                 \
+        int rc;                                                                \
                                                                                \
-    inval.value = data;                                                        \
-    inval.type_id = &name##_##vtype##_id;                                      \
-    rc = ossl_ht_insert(h, key, &inval, olddata == NULL ? NULL : &oval);       \
-    if (oval != NULL)                                                          \
-        *olddata = (vtype *)oval->value;                                       \
-    return rc;                                                                 \
-}                                                                              \
+        inval.value = data;                                                    \
+        inval.type_id = &name##_##vtype##_id;                                  \
+        rc = ossl_ht_insert(h, key, &inval, olddata == NULL ? NULL : &oval);   \
+        if (oval != NULL)                                                      \
+            *olddata = (vtype *)oval->value;                                   \
+        return rc;                                                             \
+    }                                                                          \
                                                                                \
-pfx ossl_unused vtype *ossl_ht_##name##_##vtype##_from_value(HT_VALUE *v)      \
-{                                                                              \
-    uintptr_t *expect_type = &name##_##vtype##_id;                             \
-    if (v == NULL)                                                             \
-        return NULL;                                                           \
-    if (v->type_id != expect_type)                                             \
-        return NULL;                                                           \
-    return (vtype *)v->value;                                                  \
-}                                                                              \
+    pfx ossl_unused vtype *ossl_ht_##name##_##vtype##_from_value(HT_VALUE *v)  \
+    {                                                                          \
+        uintptr_t *expect_type = &name##_##vtype##_id;                         \
+        if (v == NULL)                                                         \
+            return NULL;                                                       \
+        if (v->type_id != expect_type)                                         \
+            return NULL;                                                       \
+        return (vtype *)v->value;                                              \
+    }                                                                          \
                                                                                \
-pfx ossl_unused vtype *ossl_unused ossl_ht_##name##_##vtype##_get(HT *h,       \
-                                                                  HT_KEY *key, \
-                                                                  HT_VALUE **v)\
-{                                                                              \
-    HT_VALUE *vv;                                                              \
-    vv = ossl_ht_get(h, key);                                                  \
-    if (vv == NULL)                                                            \
-        return NULL;                                                           \
-    *v = ossl_rcu_deref(&vv);                                                  \
-    return ossl_ht_##name##_##vtype##_from_value(*v);                          \
-}                                                                              \
+    pfx ossl_unused vtype *ossl_unused ossl_ht_##name##_##vtype##_get(HT *h,   \
+        HT_KEY *key,                                                           \
+        HT_VALUE **v)                                                          \
+    {                                                                          \
+        HT_VALUE *vv;                                                          \
+        vv = ossl_ht_get(h, key);                                              \
+        if (vv == NULL)                                                        \
+            return NULL;                                                       \
+        *v = ossl_rcu_deref(&vv);                                              \
+        return ossl_ht_##name##_##vtype##_from_value(*v);                      \
+    }                                                                          \
                                                                                \
-pfx ossl_unused HT_VALUE *ossl_ht_##name##_##vtype##_to_value(vtype *data,     \
-                                                              HT_VALUE *v)     \
-{                                                                              \
-    v->type_id = &name##_##vtype##_id;                                         \
-    v->value = data;                                                           \
-    return v;                                                                  \
-}                                                                              \
+    pfx ossl_unused HT_VALUE *ossl_ht_##name##_##vtype##_to_value(vtype *data, \
+        HT_VALUE *v)                                                           \
+    {                                                                          \
+        v->type_id = &name##_##vtype##_id;                                     \
+        v->value = data;                                                       \
+        return v;                                                              \
+    }                                                                          \
                                                                                \
-pfx ossl_unused int ossl_ht_##name##_##vtype##_type(HT_VALUE *h)               \
-{                                                                              \
-    return h->type_id == &name##_##vtype##_id;                                 \
-}
+    pfx ossl_unused int ossl_ht_##name##_##vtype##_type(HT_VALUE *h)           \
+    {                                                                          \
+        return h->type_id == &name##_##vtype##_id;                             \
+    }
 
-#define DECLARE_HT_VALUE_TYPE_FNS(vtype, name)                                 \
-int ossl_ht_##name##_##vtype##_insert(HT *h, HT_KEY *key, vtype *data,         \
-                                      vtype **olddata);                        \
-vtype *ossl_ht_##name##_##vtype##_from_value(HT_VALUE *v);                     \
-vtype *ossl_unused ossl_ht_##name##_##vtype##_get(HT *h,                       \
-                                                  HT_KEY *key,                 \
-                                                  HT_VALUE **v);               \
-HT_VALUE *ossl_ht_##name##_##vtype##_to_value(vtype *data, HT_VALUE *v);       \
-int ossl_ht_##name##_##vtype##_type(HT_VALUE *h);                              \
+#define DECLARE_HT_VALUE_TYPE_FNS(vtype, name)                               \
+    int ossl_ht_##name##_##vtype##_insert(HT *h, HT_KEY *key, vtype *data,   \
+        vtype **olddata);                                                    \
+    vtype *ossl_ht_##name##_##vtype##_from_value(HT_VALUE *v);               \
+    vtype *ossl_unused ossl_ht_##name##_##vtype##_get(HT *h,                 \
+        HT_KEY *key,                                                         \
+        HT_VALUE **v);                                                       \
+    HT_VALUE *ossl_ht_##name##_##vtype##_to_value(vtype *data, HT_VALUE *v); \
+    int ossl_ht_##name##_##vtype##_type(HT_VALUE *h);
 
 /*
  * Helper function to construct case insensitive keys
@@ -295,12 +304,12 @@ void ossl_ht_read_unlock(HT *htable);
 /*
  * Write unlock
  */
-void ossl_ht_write_unlock (HT *htable);
+void ossl_ht_write_unlock(HT *htable);
 
 /*
  * Empties a hash table, potentially freeing all elements
  */
-int  ossl_ht_flush(HT *htable);
+int ossl_ht_flush(HT *htable);
 
 /*
  * Inserts an element to a hash table, optionally returning
@@ -308,7 +317,7 @@ int  ossl_ht_flush(HT *htable);
  * Returns 1 if the insert was successful, 0 on error
  */
 int ossl_ht_insert(HT *htable, HT_KEY *key, HT_VALUE *data,
-                   HT_VALUE **olddata);
+    HT_VALUE **olddata);
 
 /*
  * Deletes a value from a hash table, based on key
@@ -330,17 +339,17 @@ size_t ossl_ht_count(HT *htable);
  * table may not be inserted or removed while iterating.
  */
 void ossl_ht_foreach_until(HT *htable, int (*cb)(HT_VALUE *obj, void *arg),
-                           void *arg);
+    void *arg);
 /*
  * Returns a list of elements in a hash table based on
  * filter function return value.  Returns NULL on error,
  * or an HT_VALUE_LIST object on success.  Note it is possible
  * That a list will be returned with 0 entries, if none were found.
- * The zero length list must still be freed via ossl_ht_value_list_free 
+ * The zero length list must still be freed via ossl_ht_value_list_free
  */
 HT_VALUE_LIST *ossl_ht_filter(HT *htable, size_t max_len,
-                              int (*filter)(HT_VALUE *obj, void *arg),
-                              void *arg);
+    int (*filter)(HT_VALUE *obj, void *arg),
+    void *arg);
 /*
  * Frees the list returned from ossl_ht_filter
  */
diff --git a/include/internal/hpke_util.h b/include/internal/hpke_util.h
index e1da5e0596fb..9c52ba469386 100644
--- a/include/internal/hpke_util.h
+++ b/include/internal/hpke_util.h
@@ -8,20 +8,20 @@
  */
 
 #ifndef OSSL_INTERNAL_HPKE_UTIL_H
-# define OSSL_INTERNAL_HPKE_UTIL_H
-# pragma once
+#define OSSL_INTERNAL_HPKE_UTIL_H
+#pragma once
 
 /* Constants from RFC 9180 Section 7.1 and 7.3 */
-# define OSSL_HPKE_MAX_SECRET 64
-# define OSSL_HPKE_MAX_PUBLIC 133
-# define OSSL_HPKE_MAX_PRIVATE 66
-# define OSSL_HPKE_MAX_KDF_INPUTLEN 64
+#define OSSL_HPKE_MAX_SECRET 64
+#define OSSL_HPKE_MAX_PUBLIC 133
+#define OSSL_HPKE_MAX_PRIVATE 66
+#define OSSL_HPKE_MAX_KDF_INPUTLEN 64
 
 /*
  * max length of a base-nonce (the Nn field from OSSL_HPKE_AEAD_INFO), this
  * is used for a local stack array size
  */
-# define OSSL_HPKE_MAX_NONCELEN 12
+#define OSSL_HPKE_MAX_NONCELEN 12
 
 /*
  * @brief info about a KEM
@@ -29,35 +29,35 @@
  * and the bitmask for EC curves described in Section 7.1.3 DeriveKeyPair
  */
 typedef struct {
-    uint16_t      kem_id; /* code point for key encipherment method */
-    const char    *keytype; /* string form of algtype "EC"/"X25519"/"X448" */
-    const char    *groupname; /* string form of EC group for NIST curves  */
-    const char    *mdname; /* hash alg name for the HKDF */
-    size_t        Nsecret; /* size of secrets */
-    size_t        Nenc; /* length of encapsulated key */
-    size_t        Npk; /* length of public key */
-    size_t        Nsk; /* length of raw private key */
-    uint8_t       bitmask;
+    uint16_t kem_id; /* code point for key encipherment method */
+    const char *keytype; /* string form of algtype "EC"/"X25519"/"X448" */
+    const char *groupname; /* string form of EC group for NIST curves  */
+    const char *mdname; /* hash alg name for the HKDF */
+    size_t Nsecret; /* size of secrets */
+    size_t Nenc; /* length of encapsulated key */
+    size_t Npk; /* length of public key */
+    size_t Nsk; /* length of raw private key */
+    uint8_t bitmask;
 } OSSL_HPKE_KEM_INFO;
 
 /*
  * @brief info about a KDF
  */
 typedef struct {
-    uint16_t       kdf_id; /* code point for KDF */
-    const char     *mdname; /* hash alg name for the HKDF */
-    size_t         Nh; /* length of hash/extract output */
+    uint16_t kdf_id; /* code point for KDF */
+    const char *mdname; /* hash alg name for the HKDF */
+    size_t Nh; /* length of hash/extract output */
 } OSSL_HPKE_KDF_INFO;
 
 /*
  * @brief info about an AEAD
  */
 typedef struct {
-    uint16_t       aead_id; /* code point for aead alg */
-    const char     *name;   /* alg name */
-    size_t         taglen; /* aead tag len */
-    size_t         Nk; /* size of a key for this aead */
-    size_t         Nn; /* length of a nonce for this aead */
+    uint16_t aead_id; /* code point for aead alg */
+    const char *name; /* alg name */
+    size_t taglen; /* aead tag len */
+    size_t Nk; /* size of a key for this aead */
+    size_t Nn; /* length of a nonce for this aead */
 } OSSL_HPKE_AEAD_INFO;
 
 const OSSL_HPKE_KEM_INFO *ossl_HPKE_KEM_INFO_find_curve(const char *curve);
@@ -69,32 +69,32 @@ const OSSL_HPKE_AEAD_INFO *ossl_HPKE_AEAD_INFO_find_id(uint16_t aeadid);
 const OSSL_HPKE_AEAD_INFO *ossl_HPKE_AEAD_INFO_find_random(OSSL_LIB_CTX *ctx);
 
 int ossl_hpke_kdf_extract(EVP_KDF_CTX *kctx,
-                          unsigned char *prk, size_t prklen,
-                          const unsigned char *salt, size_t saltlen,
-                          const unsigned char *ikm, size_t ikmlen);
+    unsigned char *prk, size_t prklen,
+    const unsigned char *salt, size_t saltlen,
+    const unsigned char *ikm, size_t ikmlen);
 
 int ossl_hpke_kdf_expand(EVP_KDF_CTX *kctx,
-                         unsigned char *okm, size_t okmlen,
-                         const unsigned char *prk, size_t prklen,
-                         const unsigned char *info, size_t infolen);
+    unsigned char *okm, size_t okmlen,
+    const unsigned char *prk, size_t prklen,
+    const unsigned char *info, size_t infolen);
 
 int ossl_hpke_labeled_extract(EVP_KDF_CTX *kctx,
-                              unsigned char *prk, size_t prklen,
-                              const unsigned char *salt, size_t saltlen,
-                              const char *protocol_label,
-                              const unsigned char *suiteid, size_t suiteidlen,
-                              const char *label,
-                              const unsigned char *ikm, size_t ikmlen);
+    unsigned char *prk, size_t prklen,
+    const unsigned char *salt, size_t saltlen,
+    const char *protocol_label,
+    const unsigned char *suiteid, size_t suiteidlen,
+    const char *label,
+    const unsigned char *ikm, size_t ikmlen);
 int ossl_hpke_labeled_expand(EVP_KDF_CTX *kctx,
-                             unsigned char *okm, size_t okmlen,
-                             const unsigned char *prk, size_t prklen,
-                             const char *protocol_label,
-                             const unsigned char *suiteid, size_t suiteidlen,
-                             const char *label,
-                             const unsigned char *info, size_t infolen);
+    unsigned char *okm, size_t okmlen,
+    const unsigned char *prk, size_t prklen,
+    const char *protocol_label,
+    const unsigned char *suiteid, size_t suiteidlen,
+    const char *label,
+    const unsigned char *info, size_t infolen);
 
 EVP_KDF_CTX *ossl_kdf_ctx_create(const char *kdfname, const char *mdname,
-                                 OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int ossl_hpke_str2suite(const char *suitestr, OSSL_HPKE_SUITE *suite);
 #endif
diff --git a/include/internal/json_enc.h b/include/internal/json_enc.h
index d736a1d645f9..973debe525c5 100644
--- a/include/internal/json_enc.h
+++ b/include/internal/json_enc.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_JSON_ENC_H
-# define OSSL_JSON_ENC_H
+#define OSSL_JSON_ENC_H
 
-# include <openssl/bio.h>
+#include <openssl/bio.h>
 
 /*
  * JSON Encoder
@@ -21,22 +21,22 @@
  */
 
 struct json_write_buf {
-    BIO     *bio;
-    char    *buf;
-    size_t  alloc, cur;
+    BIO *bio;
+    char *buf;
+    size_t alloc, cur;
 };
 
 typedef struct ossl_json_enc_st {
-    uint32_t                flags;
+    uint32_t flags;
     /* error: 1 if an error has occurred. */
     /* state: current state. */
     /* stack stores a bitmap. 0=object, 1=array. */
     /* stack cur   size: stack_end_byte bytes, stack_end_bit bits. */
     /* stack alloc size: stack_bytes bytes. */
-    unsigned char           error, stack_end_bit, state, *stack, defer_indent;
-    unsigned char           stack_small[16];
-    struct json_write_buf   wbuf;
-    size_t                  stack_end_byte, stack_bytes;
+    unsigned char error, stack_end_bit, state, *stack, defer_indent;
+    unsigned char stack_small[16];
+    struct json_write_buf wbuf;
+    size_t stack_end_byte, stack_bytes;
 } OSSL_JSON_ENC;
 
 /*
@@ -62,10 +62,10 @@ typedef struct ossl_json_enc_st {
  * 2**53 - 1]` are automatically converted to decimal strings before
  * serialization.
  */
-#define OSSL_JSON_FLAG_NONE    0
-#define OSSL_JSON_FLAG_SEQ     (1U << 0)
-#define OSSL_JSON_FLAG_PRETTY  (1U << 1)
-#define OSSL_JSON_FLAG_IJSON   (1U << 2)
+#define OSSL_JSON_FLAG_NONE 0
+#define OSSL_JSON_FLAG_SEQ (1U << 0)
+#define OSSL_JSON_FLAG_PRETTY (1U << 1)
+#define OSSL_JSON_FLAG_IJSON (1U << 2)
 
 int ossl_json_init(OSSL_JSON_ENC *json, BIO *bio, uint32_t flags);
 
diff --git a/include/internal/ktls.h b/include/internal/ktls.h
index 072653dc5eeb..83f66b9dba93 100644
--- a/include/internal/ktls.h
+++ b/include/internal/ktls.h
@@ -8,43 +8,43 @@
  */
 
 #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
-#   ifdef TLS_CHACHA20_IV_LEN
-#    ifndef OPENSSL_NO_CHACHA
-#     define OPENSSL_KTLS_CHACHA20_POLY1305
-#    endif
-#   endif
+#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
+#ifdef TLS_CHACHA20_IV_LEN
+#ifndef OPENSSL_NO_CHACHA
+#define OPENSSL_KTLS_CHACHA20_POLY1305
+#endif
+#endif
 
 typedef struct tls_enable ktls_crypto_info_t;
 
@@ -71,13 +71,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
 }
 
 /* Not supported on FreeBSD */
@@ -94,13 +98,13 @@ static ossl_inline int ktls_enable_tx_zerocopy_sendfile(int fd)
  * 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);
@@ -119,14 +123,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
@@ -142,7 +146,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;
@@ -185,19 +189,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;
@@ -208,72 +213,72 @@ 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
-#   if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0)
-#    define OPENSSL_NO_KTLS_ZC_TX
-#    ifndef PEDANTIC
-#     warning "KTLS requires Kernel Headers >= 5.19.0 for zerocopy sendfile"
-#     warning "Skipping Compilation of KTLS zerocopy sendfile"
-#    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
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0)
+#define OPENSSL_NO_KTLS_ZC_TX
+#ifndef PEDANTIC
+#warning "KTLS requires Kernel Headers >= 5.19.0 for zerocopy sendfile"
+#warning "Skipping Compilation of KTLS zerocopy sendfile"
+#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;
 };
@@ -300,10 +305,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;
 }
 
 static ossl_inline int ktls_enable_tx_zerocopy_sendfile(int fd)
@@ -312,7 +325,9 @@ static ossl_inline int ktls_enable_tx_zerocopy_sendfile(int fd)
     int enable = 1;
 
     return setsockopt(fd, SOL_TLS, TLS_TX_ZEROCOPY_RO,
-                      &enable, sizeof(enable)) ? 0 : 1;
+               &enable, sizeof(enable))
+        ? 0
+        : 1;
 #else
     return 0;
 #endif
@@ -326,7 +341,7 @@ static ossl_inline int ktls_enable_tx_zerocopy_sendfile(int fd)
  * 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);
@@ -335,7 +350,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;
@@ -364,15 +379,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.
@@ -427,8 +441,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/list.h b/include/internal/list.h
index a40f7fe6c249..8bb0b741bed1 100644
--- a/include/internal/list.h
+++ b/include/internal/list.h
@@ -8,196 +8,196 @@
  */
 
 #ifndef OSSL_INTERNAL_LIST_H
-# define OSSL_INTERNAL_LIST_H
-# pragma once
+#define OSSL_INTERNAL_LIST_H
+#pragma once
 
-# include <string.h>
-# include <assert.h>
+#include <string.h>
+#include <assert.h>
 
-# ifdef NDEBUG
-#  define OSSL_LIST_DBG(x)
-# else
-#  define OSSL_LIST_DBG(x) x;
-# endif
+#ifdef NDEBUG
+#define OSSL_LIST_DBG(x)
+#else
+#define OSSL_LIST_DBG(x) x;
+#endif
 
-# define OSSL_LIST_FOREACH_FROM(p, name, init)                              \
-    for ((p) = (init);                                                      \
-         (p) != NULL;                                                       \
-         (p) = ossl_list_##name##_next(p))
-# define OSSL_LIST_FOREACH(p, name, l)                                      \
+#define OSSL_LIST_FOREACH_FROM(p, name, init) \
+    for ((p) = (init);                        \
+        (p) != NULL;                          \
+        (p) = ossl_list_##name##_next(p))
+#define OSSL_LIST_FOREACH(p, name, l) \
     OSSL_LIST_FOREACH_FROM(p, name, ossl_list_##name##_head(l))
 
-# define OSSL_LIST_FOREACH_REV_FROM(p, name, init)                          \
-    for ((p) = (init);                                                      \
-         (p) != NULL;                                                       \
-         (p) = ossl_list_##name##_prev(p))
-# define OSSL_LIST_FOREACH_REV(p, name, l)                                  \
+#define OSSL_LIST_FOREACH_REV_FROM(p, name, init) \
+    for ((p) = (init);                            \
+        (p) != NULL;                              \
+        (p) = ossl_list_##name##_prev(p))
+#define OSSL_LIST_FOREACH_REV(p, name, l) \
     OSSL_LIST_FOREACH_FROM(p, name, ossl_list_##name##_tail(l))
 
-# define OSSL_LIST_FOREACH_DELSAFE_FROM(p, pn, name, init)                  \
-    for ((p) = (init);                                                      \
-         (p) != NULL && (((pn) = ossl_list_##name##_next(p)), 1);           \
-         (p) = (pn))
-#define OSSL_LIST_FOREACH_DELSAFE(p, pn, name, l)                           \
+#define OSSL_LIST_FOREACH_DELSAFE_FROM(p, pn, name, init)        \
+    for ((p) = (init);                                           \
+        (p) != NULL && (((pn) = ossl_list_##name##_next(p)), 1); \
+        (p) = (pn))
+#define OSSL_LIST_FOREACH_DELSAFE(p, pn, name, l) \
     OSSL_LIST_FOREACH_DELSAFE_FROM(p, pn, name, ossl_list_##name##_head(l))
 
-# define OSSL_LIST_FOREACH_REV_DELSAFE_FROM(p, pn, name, init)              \
-    for ((p) = (init);                                                      \
-         (p) != NULL && (((pn) = ossl_list_##name##_prev(p)), 1);           \
-         (p) = (pn))
-# define OSSL_LIST_FOREACH_REV_DELSAFE(p, pn, name, l)                      \
+#define OSSL_LIST_FOREACH_REV_DELSAFE_FROM(p, pn, name, init)    \
+    for ((p) = (init);                                           \
+        (p) != NULL && (((pn) = ossl_list_##name##_prev(p)), 1); \
+        (p) = (pn))
+#define OSSL_LIST_FOREACH_REV_DELSAFE(p, pn, name, l) \
     OSSL_LIST_FOREACH_REV_DELSAFE_FROM(p, pn, name, ossl_list_##name##_tail(l))
 
 /* Define a list structure */
-# define OSSL_LIST(name) OSSL_LIST_ ## name
+#define OSSL_LIST(name) OSSL_LIST_##name
 
 /* Define fields to include an element of a list */
-# define OSSL_LIST_MEMBER(name, type)                                       \
-    struct {                                                                \
-        type *next, *prev;                                                  \
-        OSSL_LIST_DBG(struct ossl_list_st_ ## name *list)                   \
-    } ossl_list_ ## name
+#define OSSL_LIST_MEMBER(name, type)                    \
+    struct {                                            \
+        type *next, *prev;                              \
+        OSSL_LIST_DBG(struct ossl_list_st_##name *list) \
+    } ossl_list_##name
 
-# define DECLARE_LIST_OF(name, type)                                        \
-    typedef struct ossl_list_st_ ## name OSSL_LIST(name);                   \
-    struct ossl_list_st_ ## name {                                          \
-        type *alpha, *omega;                                                \
-        size_t num_elems;                                                   \
-    }                                                                       \
+#define DECLARE_LIST_OF(name, type)                     \
+    typedef struct ossl_list_st_##name OSSL_LIST(name); \
+    struct ossl_list_st_##name {                        \
+        type *alpha, *omega;                            \
+        size_t num_elems;                               \
+    }
 
-# define DEFINE_LIST_OF_IMPL(name, type)                                    \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_init(OSSL_LIST(name) *list)                          \
-    {                                                                       \
-        memset(list, 0, sizeof(*list));                                     \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_init_elem(type *elem)                                \
-    {                                                                       \
-        memset(&elem->ossl_list_ ## name, 0,                                \
-               sizeof(elem->ossl_list_ ## name));                           \
-    }                                                                       \
-    static ossl_unused ossl_inline int                                      \
-    ossl_list_##name##_is_empty(const OSSL_LIST(name) *list)                \
-    {                                                                       \
-        return list->num_elems == 0;                                        \
-    }                                                                       \
-    static ossl_unused ossl_inline size_t                                   \
-    ossl_list_##name##_num(const OSSL_LIST(name) *list)                     \
-    {                                                                       \
-        return list->num_elems;                                             \
-    }                                                                       \
-    static ossl_unused ossl_inline type *                                   \
-    ossl_list_##name##_head(const OSSL_LIST(name) *list)                    \
-    {                                                                       \
-        assert(list->alpha == NULL                                          \
-               || list->alpha->ossl_list_ ## name.list == list);            \
-        return list->alpha;                                                 \
-    }                                                                       \
-    static ossl_unused ossl_inline type *                                   \
-    ossl_list_##name##_tail(const OSSL_LIST(name) *list)                    \
-    {                                                                       \
-        assert(list->omega == NULL                                          \
-               || list->omega->ossl_list_ ## name.list == list);            \
-        return list->omega;                                                 \
-    }                                                                       \
-    static ossl_unused ossl_inline type *                                   \
-    ossl_list_##name##_next(const type *elem)                               \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.next == NULL                        \
-               || elem->ossl_list_ ## name.next                             \
-                      ->ossl_list_ ## name.prev == elem);                   \
-        return elem->ossl_list_ ## name.next;                               \
-    }                                                                       \
-    static ossl_unused ossl_inline type *                                   \
-    ossl_list_##name##_prev(const type *elem)                               \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.prev == NULL                        \
-               || elem->ossl_list_ ## name.prev                             \
-                      ->ossl_list_ ## name.next == elem);                   \
-        return elem->ossl_list_ ## name.prev;                               \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_remove(OSSL_LIST(name) *list, type *elem)            \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.list == list);                      \
-        OSSL_LIST_DBG(elem->ossl_list_ ## name.list = NULL)                 \
-        if (list->alpha == elem)                                            \
-            list->alpha = elem->ossl_list_ ## name.next;                    \
-        if (list->omega == elem)                                            \
-            list->omega = elem->ossl_list_ ## name.prev;                    \
-        if (elem->ossl_list_ ## name.prev != NULL)                          \
-            elem->ossl_list_ ## name.prev->ossl_list_ ## name.next =        \
-                    elem->ossl_list_ ## name.next;                          \
-        if (elem->ossl_list_ ## name.next != NULL)                          \
-            elem->ossl_list_ ## name.next->ossl_list_ ## name.prev =        \
-                    elem->ossl_list_ ## name.prev;                          \
-        list->num_elems--;                                                  \
-        memset(&elem->ossl_list_ ## name, 0,                                \
-               sizeof(elem->ossl_list_ ## name));                           \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_insert_head(OSSL_LIST(name) *list, type *elem)       \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.list == NULL);                      \
-        OSSL_LIST_DBG(elem->ossl_list_ ## name.list = list)                 \
-        if (list->alpha != NULL)                                            \
-            list->alpha->ossl_list_ ## name.prev = elem;                    \
-        elem->ossl_list_ ## name.next = list->alpha;                        \
-        elem->ossl_list_ ## name.prev = NULL;                               \
-        list->alpha = elem;                                                 \
-        if (list->omega == NULL)                                            \
-            list->omega = elem;                                             \
-        list->num_elems++;                                                  \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_insert_tail(OSSL_LIST(name) *list, type *elem)       \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.list == NULL);                      \
-        OSSL_LIST_DBG(elem->ossl_list_ ## name.list = list)                 \
-        if (list->omega != NULL)                                            \
-            list->omega->ossl_list_ ## name.next = elem;                    \
-        elem->ossl_list_ ## name.prev = list->omega;                        \
-        elem->ossl_list_ ## name.next = NULL;                               \
-        list->omega = elem;                                                 \
-        if (list->alpha == NULL)                                            \
-            list->alpha = elem;                                             \
-        list->num_elems++;                                                  \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_insert_before(OSSL_LIST(name) *list, type *e,        \
-                                     type *elem)                            \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.list == NULL);                      \
-        OSSL_LIST_DBG(elem->ossl_list_ ## name.list = list)                 \
-        elem->ossl_list_ ## name.next = e;                                  \
-        elem->ossl_list_ ## name.prev = e->ossl_list_ ## name.prev;         \
-        if (e->ossl_list_ ## name.prev != NULL)                             \
-            e->ossl_list_ ## name.prev->ossl_list_ ## name.next = elem;     \
-        e->ossl_list_ ## name.prev = elem;                                  \
-        if (list->alpha == e)                                               \
-            list->alpha = elem;                                             \
-        list->num_elems++;                                                  \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_list_##name##_insert_after(OSSL_LIST(name) *list, type *e,         \
-                                    type *elem)                             \
-    {                                                                       \
-        assert(elem->ossl_list_ ## name.list == NULL);                      \
-        OSSL_LIST_DBG(elem->ossl_list_ ## name.list = list)                 \
-        elem->ossl_list_ ## name.prev = e;                                  \
-        elem->ossl_list_ ## name.next = e->ossl_list_ ## name.next;         \
-        if (e->ossl_list_ ## name.next != NULL)                             \
-            e->ossl_list_ ## name.next->ossl_list_ ## name.prev = elem;     \
-        e->ossl_list_ ## name.next = elem;                                  \
-        if (list->omega == e)                                               \
-            list->omega = elem;                                             \
-        list->num_elems++;                                                  \
-    }                                                                       \
-    struct ossl_list_st_ ## name
+#define DEFINE_LIST_OF_IMPL(name, type)                                                       \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_init(OSSL_LIST(name) * list)                                           \
+    {                                                                                         \
+        memset(list, 0, sizeof(*list));                                                       \
+    }                                                                                         \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_init_elem(type *elem)                                                  \
+    {                                                                                         \
+        memset(&elem->ossl_list_##name, 0,                                                    \
+            sizeof(elem->ossl_list_##name));                                                  \
+    }                                                                                         \
+    static ossl_unused ossl_inline int                                                        \
+    ossl_list_##name##_is_empty(const OSSL_LIST(name) * list)                                 \
+    {                                                                                         \
+        return list->num_elems == 0;                                                          \
+    }                                                                                         \
+    static ossl_unused ossl_inline size_t                                                     \
+    ossl_list_##name##_num(const OSSL_LIST(name) * list)                                      \
+    {                                                                                         \
+        return list->num_elems;                                                               \
+    }                                                                                         \
+    static ossl_unused ossl_inline type *                                                     \
+    ossl_list_##name##_head(const OSSL_LIST(name) * list)                                     \
+    {                                                                                         \
+        assert(list->alpha == NULL                                                            \
+            || list->alpha->ossl_list_##name.list == list);                                   \
+        return list->alpha;                                                                   \
+    }                                                                                         \
+    static ossl_unused ossl_inline type *                                                     \
+    ossl_list_##name##_tail(const OSSL_LIST(name) * list)                                     \
+    {                                                                                         \
+        assert(list->omega == NULL                                                            \
+            || list->omega->ossl_list_##name.list == list);                                   \
+        return list->omega;                                                                   \
+    }                                                                                         \
+    static ossl_unused ossl_inline type *                                                     \
+    ossl_list_##name##_next(const type *elem)                                                 \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.next == NULL                                            \
+            || elem->ossl_list_##name.next                                                    \
+                    ->ossl_list_##name.prev                                                   \
+                == elem);                                                                     \
+        return elem->ossl_list_##name.next;                                                   \
+    }                                                                                         \
+    static ossl_unused ossl_inline type *                                                     \
+    ossl_list_##name##_prev(const type *elem)                                                 \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.prev == NULL                                            \
+            || elem->ossl_list_##name.prev                                                    \
+                    ->ossl_list_##name.next                                                   \
+                == elem);                                                                     \
+        return elem->ossl_list_##name.prev;                                                   \
+    }                                                                                         \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_remove(OSSL_LIST(name) * list, type * elem)                            \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.list == list);                                          \
+        OSSL_LIST_DBG(elem->ossl_list_##name.list = NULL)                                     \
+        if (list->alpha == elem)                                                              \
+            list->alpha = elem->ossl_list_##name.next;                                        \
+        if (list->omega == elem)                                                              \
+            list->omega = elem->ossl_list_##name.prev;                                        \
+        if (elem->ossl_list_##name.prev != NULL)                                              \
+            elem->ossl_list_##name.prev->ossl_list_##name.next = elem->ossl_list_##name.next; \
+        if (elem->ossl_list_##name.next != NULL)                                              \
+            elem->ossl_list_##name.next->ossl_list_##name.prev = elem->ossl_list_##name.prev; \
+        list->num_elems--;                                                                    \
+        memset(&elem->ossl_list_##name, 0,                                                    \
+            sizeof(elem->ossl_list_##name));                                                  \
+    }                                                                                         \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_insert_head(OSSL_LIST(name) * list, type * elem)                       \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.list == NULL);                                          \
+        OSSL_LIST_DBG(elem->ossl_list_##name.list = list)                                     \
+        if (list->alpha != NULL)                                                              \
+            list->alpha->ossl_list_##name.prev = elem;                                        \
+        elem->ossl_list_##name.next = list->alpha;                                            \
+        elem->ossl_list_##name.prev = NULL;                                                   \
+        list->alpha = elem;                                                                   \
+        if (list->omega == NULL)                                                              \
+            list->omega = elem;                                                               \
+        list->num_elems++;                                                                    \
+    }                                                                                         \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_insert_tail(OSSL_LIST(name) * list, type * elem)                       \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.list == NULL);                                          \
+        OSSL_LIST_DBG(elem->ossl_list_##name.list = list)                                     \
+        if (list->omega != NULL)                                                              \
+            list->omega->ossl_list_##name.next = elem;                                        \
+        elem->ossl_list_##name.prev = list->omega;                                            \
+        elem->ossl_list_##name.next = NULL;                                                   \
+        list->omega = elem;                                                                   \
+        if (list->alpha == NULL)                                                              \
+            list->alpha = elem;                                                               \
+        list->num_elems++;                                                                    \
+    }                                                                                         \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_insert_before(OSSL_LIST(name) * list, type * e,                        \
+        type * elem)                                                                          \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.list == NULL);                                          \
+        OSSL_LIST_DBG(elem->ossl_list_##name.list = list)                                     \
+        elem->ossl_list_##name.next = e;                                                      \
+        elem->ossl_list_##name.prev = e->ossl_list_##name.prev;                               \
+        if (e->ossl_list_##name.prev != NULL)                                                 \
+            e->ossl_list_##name.prev->ossl_list_##name.next = elem;                           \
+        e->ossl_list_##name.prev = elem;                                                      \
+        if (list->alpha == e)                                                                 \
+            list->alpha = elem;                                                               \
+        list->num_elems++;                                                                    \
+    }                                                                                         \
+    static ossl_unused ossl_inline void                                                       \
+    ossl_list_##name##_insert_after(OSSL_LIST(name) * list, type * e,                         \
+        type * elem)                                                                          \
+    {                                                                                         \
+        assert(elem->ossl_list_##name.list == NULL);                                          \
+        OSSL_LIST_DBG(elem->ossl_list_##name.list = list)                                     \
+        elem->ossl_list_##name.prev = e;                                                      \
+        elem->ossl_list_##name.next = e->ossl_list_##name.next;                               \
+        if (e->ossl_list_##name.next != NULL)                                                 \
+            e->ossl_list_##name.next->ossl_list_##name.prev = elem;                           \
+        e->ossl_list_##name.next = elem;                                                      \
+        if (list->omega == e)                                                                 \
+            list->omega = elem;                                                               \
+        list->num_elems++;                                                                    \
+    }                                                                                         \
+    struct ossl_list_st_##name
 
-# define DEFINE_LIST_OF(name, type)                                         \
-    DECLARE_LIST_OF(name, type);                                            \
+#define DEFINE_LIST_OF(name, type) \
+    DECLARE_LIST_OF(name, type);   \
     DEFINE_LIST_OF_IMPL(name, type)
 
 #endif
diff --git a/include/internal/namemap.h b/include/internal/namemap.h
index a3a3414869ae..f74a7d72d505 100644
--- a/include/internal/namemap.h
+++ b/include/internal/namemap.h
@@ -26,16 +26,16 @@ int ossl_namemap_add_name(OSSL_NAMEMAP *namemap, int number, const char *name);
  */
 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 4a93a2475637..38d9d102fe85 100644
--- a/include/internal/numbers.h
+++ b/include/internal/numbers.h
@@ -8,103 +8,101 @@
  */
 
 #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         /* Ones' complement */
+#elif (-1 & 3) == 0x02 /* Ones' 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
 
 /*
  * 64-bit processor with LP64 ABI
  */
-# ifdef SIXTY_FOUR_BIT_LONG
-#  ifndef UINT32_C
-#   define UINT32_C(c) (c)
-#  endif
-#  ifndef UINT64_C
-#   define UINT64_C(c) (c##UL)
-#  endif
-# endif
+#ifdef SIXTY_FOUR_BIT_LONG
+#ifndef UINT32_C
+#define UINT32_C(c) (c)
+#endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c##UL)
+#endif
+#endif
 
 /*
  * 64-bit processor other than LP64 ABI
  */
-# ifdef SIXTY_FOUR_BIT
-#  ifndef UINT32_C
-#   define UINT32_C(c) (c##UL)
-#  endif
-#  ifndef UINT64_C
-#   define UINT64_C(c) (c##ULL)
-#  endif
-# endif
-
+#ifdef SIXTY_FOUR_BIT
+#ifndef UINT32_C
+#define UINT32_C(c) (c##UL)
+#endif
+#ifndef UINT64_C
+#define UINT64_C(c) (c##ULL)
+#endif
+#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 6fcd345ce28d..e5de4d43283f 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,19 +673,19 @@ 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
 
 /* QUIC variable-length integer length prefix */
-#define WPACKET_FLAGS_QUIC_VLINT                4
+#define WPACKET_FLAGS_QUIC_VLINT 4
 
 /*
  * Initialise a WPACKET with the buffer in |buf|. The buffer must exist
@@ -727,7 +720,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
@@ -799,7 +792,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
@@ -808,7 +801,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
@@ -847,7 +840,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
@@ -900,7 +893,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) \
@@ -936,4 +929,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/packet_quic.h b/include/internal/packet_quic.h
index 5173b4675d8d..783ede37715e 100644
--- a/include/internal/packet_quic.h
+++ b/include/internal/packet_quic.h
@@ -8,19 +8,19 @@
  */
 
 #ifndef OSSL_INTERNAL_PACKET_QUIC_H
-# define OSSL_INTERNAL_PACKET_QUIC_H
-# pragma once
+#define OSSL_INTERNAL_PACKET_QUIC_H
+#pragma once
 
-# include "internal/packet.h"
-# include "internal/quic_vlint.h"
+#include "internal/packet.h"
+#include "internal/quic_vlint.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 /*
  * Decodes a QUIC variable-length integer in |pkt| and stores the result in
  * |data|.
  */
 __owur static ossl_inline int PACKET_get_quic_vlint(PACKET *pkt,
-                                                    uint64_t *data)
+    uint64_t *data)
 {
     size_t enclen;
 
@@ -44,8 +44,8 @@ __owur static ossl_inline int PACKET_get_quic_vlint(PACKET *pkt,
  * was encoded using the minimal possible number of bytes and 0 otherwise.
  */
 __owur static ossl_inline int PACKET_peek_quic_vlint_ex(PACKET *pkt,
-                                                        uint64_t *data,
-                                                        int *was_minimal)
+    uint64_t *data,
+    int *was_minimal)
 {
     size_t enclen;
 
@@ -66,7 +66,7 @@ __owur static ossl_inline int PACKET_peek_quic_vlint_ex(PACKET *pkt,
 }
 
 __owur static ossl_inline int PACKET_peek_quic_vlint(PACKET *pkt,
-                                                     uint64_t *data)
+    uint64_t *data)
 {
     return PACKET_peek_quic_vlint_ex(pkt, data, NULL);
 }
@@ -98,15 +98,13 @@ __owur static ossl_inline int PACKET_skip_quic_vlint(PACKET *pkt)
  * |subpkt|. Upon failure, the original |pkt| and |subpkt| are not modified.
  */
 __owur static ossl_inline int PACKET_get_quic_length_prefixed(PACKET *pkt,
-                                                              PACKET *subpkt)
+    PACKET *subpkt)
 {
     uint64_t length;
     const unsigned char *data;
     PACKET tmp = *pkt;
 
-    if (!PACKET_get_quic_vlint(&tmp, &length) ||
-        length > SIZE_MAX ||
-        !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
+    if (!PACKET_get_quic_vlint(&tmp, &length) || length > SIZE_MAX || !PACKET_get_bytes(&tmp, &data, (size_t)length)) {
         return 0;
     }
 
@@ -139,12 +137,12 @@ __owur int WPACKET_start_quic_sub_packet_bound(WPACKET *pkt, size_t max_len);
  * variable-length integer encoding length.
  */
 __owur int WPACKET_quic_sub_allocate_bytes(WPACKET *pkt, size_t len,
-                                           unsigned char **bytes);
+    unsigned char **bytes);
 
 /*
  * Write a QUIC variable-length integer to the packet.
  */
 __owur int WPACKET_quic_write_vlint(WPACKET *pkt, uint64_t v);
 
-# endif                         /* OPENSSL_NO_QUIC */
-#endif                          /* OSSL_INTERNAL_PACKET_QUIC_H */
+#endif /* OPENSSL_NO_QUIC */
+#endif /* OSSL_INTERNAL_PACKET_QUIC_H */
diff --git a/include/internal/param_build_set.h b/include/internal/param_build_set.h
index 3518f008f009..c7785a12e616 100644
--- a/include/internal/param_build_set.h
+++ b/include/internal/param_build_set.h
@@ -8,44 +8,44 @@
  */
 
 #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_signed_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_signed_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/param_names.h.in b/include/internal/param_names.h.in
index f34db21951c5..cb1378b3908a 100644
--- a/include/internal/param_names.h.in
+++ b/include/internal/param_names.h.in
@@ -8,11 +8,15 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+/* clang-format off */
 {-
 use OpenSSL::paramnames qw(generate_internal_macros);
 -}
+/* clang-format on */
 
 int ossl_param_find_pidx(const char *s);
 
 /* Parameter name definitions - generated by util/perl/OpenSSL/paramnames.pm */
+/* clang-format off */
 {- generate_internal_macros(); -}
+/* clang-format on */
diff --git a/include/internal/params.h b/include/internal/params.h
index 3fbd0cf954c5..d0d309886d9a 100644
--- a/include/internal/params.h
+++ b/include/internal/params.h
@@ -20,7 +20,7 @@
  * doesn't return success.
  */
 int ossl_param_get1_octet_string(const OSSL_PARAM *params, const char *name,
-                                 unsigned char **out, size_t *out_len);
+    unsigned char **out, size_t *out_len);
 /*
  * Concatenate all of the matching params together.
  * *out will point to an allocated buffer on successful return.
@@ -34,5 +34,5 @@ int ossl_param_get1_octet_string(const OSSL_PARAM *params, const char *name,
  * doesn't return success.
  */
 int ossl_param_get1_concat_octet_string(const OSSL_PARAM *params, const char *name,
-                                        unsigned char **out, size_t *out_len,
-                                        size_t maxsize);
+    unsigned char **out, size_t *out_len,
+    size_t maxsize);
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/priority_queue.h b/include/internal/priority_queue.h
index 5be03bf131c8..067c8815961e 100644
--- a/include/internal/priority_queue.h
+++ b/include/internal/priority_queue.h
@@ -8,68 +8,67 @@
  */
 
 #ifndef OSSL_INTERNAL_PRIORITY_QUEUE_H
-# define OSSL_INTERNAL_PRIORITY_QUEUE_H
-# pragma once
+#define OSSL_INTERNAL_PRIORITY_QUEUE_H
+#pragma once
 
-# include <stdlib.h>
-# include <openssl/e_os2.h>
+#include <stdlib.h>
+#include <openssl/e_os2.h>
 
-# define PRIORITY_QUEUE_OF(type) OSSL_PRIORITY_QUEUE_ ## type
+#define PRIORITY_QUEUE_OF(type) OSSL_PRIORITY_QUEUE_##type
 
-# define DEFINE_PRIORITY_QUEUE_OF_INTERNAL(type, ctype)                     \
-    typedef struct ossl_priority_queue_st_ ## type PRIORITY_QUEUE_OF(type); \
-    static ossl_unused ossl_inline PRIORITY_QUEUE_OF(type) *                \
-    ossl_pqueue_##type##_new(int (*compare)(const ctype *, const ctype *))  \
-    {                                                                       \
-        return (PRIORITY_QUEUE_OF(type) *)ossl_pqueue_new(                  \
-                    (int (*)(const void *, const void *))compare);          \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_pqueue_##type##_free(PRIORITY_QUEUE_OF(type) *pq)                  \
-    {                                                                       \
-        ossl_pqueue_free((OSSL_PQUEUE *)pq);                                \
-    }                                                                       \
-    static ossl_unused ossl_inline void                                     \
-    ossl_pqueue_##type##_pop_free(PRIORITY_QUEUE_OF(type) *pq,              \
-                                  void (*freefunc)(ctype *))                \
-    {                                                                       \
-        ossl_pqueue_pop_free((OSSL_PQUEUE *)pq, (void (*)(void *))freefunc);\
-    }                                                                       \
-    static ossl_unused ossl_inline int                                      \
-    ossl_pqueue_##type##_reserve(PRIORITY_QUEUE_OF(type) *pq, size_t n)     \
-    {                                                                       \
-        return ossl_pqueue_reserve((OSSL_PQUEUE *)pq, n);                   \
-    }                                                                       \
-    static ossl_unused ossl_inline size_t                                   \
-    ossl_pqueue_##type##_num(const PRIORITY_QUEUE_OF(type) *pq)             \
-    {                                                                       \
-        return ossl_pqueue_num((OSSL_PQUEUE *)pq);                          \
-    }                                                                       \
-    static ossl_unused ossl_inline int                                      \
-    ossl_pqueue_##type##_push(PRIORITY_QUEUE_OF(type) *pq,                  \
-                              ctype *data, size_t *elem)                    \
-    {                                                                       \
-        return ossl_pqueue_push((OSSL_PQUEUE *)pq, (void *)data, elem);     \
-    }                                                                       \
-    static ossl_unused ossl_inline ctype *                                  \
-    ossl_pqueue_##type##_peek(const PRIORITY_QUEUE_OF(type) *pq)            \
-    {                                                                       \
-        return (type *)ossl_pqueue_peek((OSSL_PQUEUE *)pq);                 \
-    }                                                                       \
-    static ossl_unused ossl_inline ctype *                                  \
-    ossl_pqueue_##type##_pop(PRIORITY_QUEUE_OF(type) *pq)                   \
-    {                                                                       \
-        return (type *)ossl_pqueue_pop((OSSL_PQUEUE *)pq);                  \
-    }                                                                       \
-    static ossl_unused ossl_inline ctype *                                  \
-    ossl_pqueue_##type##_remove(PRIORITY_QUEUE_OF(type) *pq,                \
-                                size_t elem)                                \
-    {                                                                       \
-        return (type *)ossl_pqueue_remove((OSSL_PQUEUE *)pq, elem);         \
-    }                                                                       \
-    struct ossl_priority_queue_st_ ## type
+#define DEFINE_PRIORITY_QUEUE_OF_INTERNAL(type, ctype)                                                                              \
+    typedef struct ossl_priority_queue_st_##type PRIORITY_QUEUE_OF(type);                                                           \
+    static ossl_unused ossl_inline PRIORITY_QUEUE_OF(type) * ossl_pqueue_##type##_new(int (*compare)(const ctype *, const ctype *)) \
+    {                                                                                                                               \
+        return (PRIORITY_QUEUE_OF(type) *)ossl_pqueue_new(                                                                          \
+            (int (*)(const void *, const void *))compare);                                                                          \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline void                                                                                             \
+    ossl_pqueue_##type##_free(PRIORITY_QUEUE_OF(type) * pq)                                                                         \
+    {                                                                                                                               \
+        ossl_pqueue_free((OSSL_PQUEUE *)pq);                                                                                        \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline void                                                                                             \
+    ossl_pqueue_##type##_pop_free(PRIORITY_QUEUE_OF(type) * pq,                                                                     \
+        void (*freefunc)(ctype *))                                                                                                  \
+    {                                                                                                                               \
+        ossl_pqueue_pop_free((OSSL_PQUEUE *)pq, (void (*)(void *))freefunc);                                                        \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline int                                                                                              \
+    ossl_pqueue_##type##_reserve(PRIORITY_QUEUE_OF(type) * pq, size_t n)                                                            \
+    {                                                                                                                               \
+        return ossl_pqueue_reserve((OSSL_PQUEUE *)pq, n);                                                                           \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline size_t                                                                                           \
+    ossl_pqueue_##type##_num(const PRIORITY_QUEUE_OF(type) * pq)                                                                    \
+    {                                                                                                                               \
+        return ossl_pqueue_num((OSSL_PQUEUE *)pq);                                                                                  \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline int                                                                                              \
+    ossl_pqueue_##type##_push(PRIORITY_QUEUE_OF(type) * pq,                                                                         \
+        ctype * data, size_t *elem)                                                                                                 \
+    {                                                                                                                               \
+        return ossl_pqueue_push((OSSL_PQUEUE *)pq, (void *)data, elem);                                                             \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline ctype *                                                                                          \
+    ossl_pqueue_##type##_peek(const PRIORITY_QUEUE_OF(type) * pq)                                                                   \
+    {                                                                                                                               \
+        return (type *)ossl_pqueue_peek((OSSL_PQUEUE *)pq);                                                                         \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline ctype *                                                                                          \
+    ossl_pqueue_##type##_pop(PRIORITY_QUEUE_OF(type) * pq)                                                                          \
+    {                                                                                                                               \
+        return (type *)ossl_pqueue_pop((OSSL_PQUEUE *)pq);                                                                          \
+    }                                                                                                                               \
+    static ossl_unused ossl_inline ctype *                                                                                          \
+    ossl_pqueue_##type##_remove(PRIORITY_QUEUE_OF(type) * pq,                                                                       \
+        size_t elem)                                                                                                                \
+    {                                                                                                                               \
+        return (type *)ossl_pqueue_remove((OSSL_PQUEUE *)pq, elem);                                                                 \
+    }                                                                                                                               \
+    struct ossl_priority_queue_st_##type
 
-# define DEFINE_PRIORITY_QUEUE_OF(type) \
+#define DEFINE_PRIORITY_QUEUE_OF(type) \
     DEFINE_PRIORITY_QUEUE_OF_INTERNAL(type, type)
 
 typedef struct ossl_pqueue_st OSSL_PQUEUE;
diff --git a/include/internal/property.h b/include/internal/property.h
index 3adff4994003..b63634c678d5 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 7d94346155cc..1b4050a81f52 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,
-                                 OSSL_PARAM *params, int noconfig);
+    OSSL_provider_init_fn *init_function,
+    OSSL_PARAM *params, int noconfig);
 int ossl_provider_up_ref(OSSL_PROVIDER *prov);
 void ossl_provider_free(OSSL_PROVIDER *prov);
 
@@ -56,7 +56,7 @@ 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);
@@ -66,9 +66,9 @@ int ossl_provider_activate_fallbacks(OSSL_LIB_CTX *ctx);
 
 /* 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);
@@ -83,18 +83,18 @@ 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);
 int ossl_provider_random_bytes(const OSSL_PROVIDER *prov, int which,
-                               void *buf, size_t n, unsigned int strength);
+    void *buf, size_t n, unsigned int strength);
 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
@@ -103,19 +103,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/qlog.h b/include/internal/qlog.h
index b81bfe7e4b96..0455f21b48c9 100644
--- a/include/internal/qlog.h
+++ b/include/internal/qlog.h
@@ -8,34 +8,34 @@
  */
 
 #ifndef OSSL_QLOG_H
-# define OSSL_QLOG_H
+#define OSSL_QLOG_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/time.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/time.h"
 
 typedef struct qlog_st QLOG;
 
-# ifndef OPENSSL_NO_QLOG
+#ifndef OPENSSL_NO_QLOG
 
 enum {
     QLOG_EVENT_TYPE_NONE,
 
-#  define QLOG_EVENT(cat, name) QLOG_EVENT_TYPE_##cat##_##name,
-#  include "internal/qlog_events.h"
-#  undef QLOG_EVENT
+#define QLOG_EVENT(cat, name) QLOG_EVENT_TYPE_##cat##_##name,
+#include "internal/qlog_events.h"
+#undef QLOG_EVENT
 
     QLOG_EVENT_TYPE_NUM
 };
 
 typedef struct qlog_trace_info_st {
-    QUIC_CONN_ID    odcid;
-    const char      *title, *description, *group_id;
-    int             is_server;
-    OSSL_TIME       (*now_cb)(void *arg);
-    void            *now_cb_arg;
-    uint64_t        override_process_id;
-    const char      *override_impl_name;
+    QUIC_CONN_ID odcid;
+    const char *title, *description, *group_id;
+    int is_server;
+    OSSL_TIME (*now_cb)(void *arg);
+    void *now_cb_arg;
+    uint64_t override_process_id;
+    const char *override_impl_name;
 } QLOG_TRACE_INFO;
 
 QLOG *ossl_qlog_new(const QLOG_TRACE_INFO *info);
@@ -45,13 +45,13 @@ void ossl_qlog_free(QLOG *qlog);
 
 /* Configuration */
 int ossl_qlog_set_event_type_enabled(QLOG *qlog, uint32_t event_type,
-                                     int enable);
+    int enable);
 int ossl_qlog_set_filter(QLOG *qlog, const char *filter);
 
 int ossl_qlog_set_sink_bio(QLOG *qlog, BIO *bio);
-#  ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int ossl_qlog_set_sink_file(QLOG *qlog, FILE *file, int close_flag);
-#  endif
+#endif
 int ossl_qlog_set_sink_filename(QLOG *qlog, const char *filename);
 
 /* Operations */
@@ -62,8 +62,8 @@ int ossl_qlog_enabled(QLOG *qlog, uint32_t event_type);
 
 /* Grouping Functions */
 int ossl_qlog_event_try_begin(QLOG *qlog, uint32_t event_type,
-                              const char *event_cat, const char *event_name,
-                              const char *event_combined_name);
+    const char *event_cat, const char *event_name,
+    const char *event_combined_name);
 void ossl_qlog_event_end(QLOG *qlog);
 
 void ossl_qlog_group_begin(QLOG *qlog, const char *name);
@@ -75,57 +75,57 @@ void ossl_qlog_array_end(QLOG *qlog);
 void ossl_qlog_override_time(QLOG *qlog, OSSL_TIME event_time);
 
 /* Grouping Macros */
-#  define QLOG_EVENT_BEGIN(qlog, cat, name)                                 \
-    {                                                                       \
-        QLOG *qlog_instance = (qlog);                                       \
-        uint32_t qlog_event_type = QLOG_EVENT_TYPE_##cat##_##name;          \
-                                                                            \
-        if (ossl_qlog_event_try_begin(qlog_instance, qlog_event_type,       \
-                                      #cat, #name, #cat ":" #name)) {
+#define QLOG_EVENT_BEGIN(qlog, cat, name)                             \
+    {                                                                 \
+        QLOG *qlog_instance = (qlog);                                 \
+        uint32_t qlog_event_type = QLOG_EVENT_TYPE_##cat##_##name;    \
+                                                                      \
+        if (ossl_qlog_event_try_begin(qlog_instance, qlog_event_type, \
+                #cat, #name, #cat ":" #name)) {
 
-#  define QLOG_EVENT_END()                                                  \
-            ossl_qlog_event_end(qlog_instance);                             \
-        }                                                                   \
+#define QLOG_EVENT_END()                \
+    ossl_qlog_event_end(qlog_instance); \
+    }                                   \
     }
 
-#  define QLOG_BEGIN(name)                                                  \
-    {                                                                       \
+#define QLOG_BEGIN(name) \
+    {                    \
         ossl_qlog_group_begin(qlog_instance, (name));
 
-#  define QLOG_END()                                                        \
-        ossl_qlog_group_end(qlog_instance);                                 \
+#define QLOG_END()                      \
+    ossl_qlog_group_end(qlog_instance); \
     }
 
-#  define QLOG_BEGIN_ARRAY(name)                                            \
-    {                                                                       \
+#define QLOG_BEGIN_ARRAY(name) \
+    {                          \
         ossl_qlog_array_begin(qlog_instance, (name));
 
-#  define QLOG_END_ARRAY()                                                  \
-        ossl_qlog_array_end(qlog_instance);                                 \
+#define QLOG_END_ARRAY()                \
+    ossl_qlog_array_end(qlog_instance); \
     }
 
 /* Field Functions */
 void ossl_qlog_str(QLOG *qlog, const char *name, const char *value);
 void ossl_qlog_str_len(QLOG *qlog, const char *name,
-                       const char *value, size_t value_len);
+    const char *value, size_t value_len);
 void ossl_qlog_u64(QLOG *qlog, const char *name, uint64_t value);
 void ossl_qlog_i64(QLOG *qlog, const char *name, int64_t value);
 void ossl_qlog_bool(QLOG *qlog, const char *name, int value);
 void ossl_qlog_bin(QLOG *qlog, const char *name,
-                   const void *value, size_t value_len);
+    const void *value, size_t value_len);
 
 /* Field Macros */
-#  define QLOG_STR(name, value)   ossl_qlog_str(qlog_instance, (name), (value))
-#  define QLOG_STR_LEN(name, value, value_len)                                \
+#define QLOG_STR(name, value) ossl_qlog_str(qlog_instance, (name), (value))
+#define QLOG_STR_LEN(name, value, value_len) \
     ossl_qlog_str_len(qlog_instance, (name), (value), (value_len))
-#  define QLOG_I64(name, value)   ossl_qlog_i64(qlog_instance, (name), (value))
-#  define QLOG_U64(name, value)   ossl_qlog_u64(qlog_instance, (name), (value))
-#  define QLOG_F64(name, value)   ossl_qlog_f64(qlog_instance, (name), (value))
-#  define QLOG_BOOL(name, value)  ossl_qlog_bool(qlog_instance, (name), (value))
-#  define QLOG_BIN(name, value, value_len) \
+#define QLOG_I64(name, value) ossl_qlog_i64(qlog_instance, (name), (value))
+#define QLOG_U64(name, value) ossl_qlog_u64(qlog_instance, (name), (value))
+#define QLOG_F64(name, value) ossl_qlog_f64(qlog_instance, (name), (value))
+#define QLOG_BOOL(name, value) ossl_qlog_bool(qlog_instance, (name), (value))
+#define QLOG_BIN(name, value, value_len) \
     ossl_qlog_bin(qlog_instance, (name), (value), (value_len))
-#  define QLOG_CID(name, value) QLOG_BIN((name), (value)->id, (value)->id_len)
+#define QLOG_CID(name, value) QLOG_BIN((name), (value)->id, (value)->id_len)
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/qlog_event_helpers.h b/include/internal/qlog_event_helpers.h
index 43d62360805a..e885bfd50307 100644
--- a/include/internal/qlog_event_helpers.h
+++ b/include/internal/qlog_event_helpers.h
@@ -8,49 +8,49 @@
  */
 
 #ifndef OSSL_QLOG_EVENT_HELPERS_H
-# define OSSL_QLOG_EVENT_HELPERS_H
+#define OSSL_QLOG_EVENT_HELPERS_H
 
-# include <openssl/ssl.h>
-# include "internal/qlog.h"
-# include "internal/quic_types.h"
-# include "internal/quic_channel.h"
-# include "internal/quic_txpim.h"
-# include "internal/quic_record_tx.h"
-# include "internal/quic_wire_pkt.h"
+#include <openssl/ssl.h>
+#include "internal/qlog.h"
+#include "internal/quic_types.h"
+#include "internal/quic_channel.h"
+#include "internal/quic_txpim.h"
+#include "internal/quic_record_tx.h"
+#include "internal/quic_wire_pkt.h"
 
 /* connectivity:connection_started */
 void ossl_qlog_event_connectivity_connection_started(QLOG *qlog,
-                                                     const QUIC_CONN_ID *init_dcid);
+    const QUIC_CONN_ID *init_dcid);
 
 /* connectivity:connection_state_updated */
 void ossl_qlog_event_connectivity_connection_state_updated(QLOG *qlog,
-                                                           uint32_t old_state,
-                                                           uint32_t new_state,
-                                                           int handshake_complete,
-                                                           int handshake_confirmed);
+    uint32_t old_state,
+    uint32_t new_state,
+    int handshake_complete,
+    int handshake_confirmed);
 
 /* connectivity:connection_closed */
 void ossl_qlog_event_connectivity_connection_closed(QLOG *qlog,
-                                                    const QUIC_TERMINATE_CAUSE *tcause);
+    const QUIC_TERMINATE_CAUSE *tcause);
 
 /* recovery:packet_lost */
 void ossl_qlog_event_recovery_packet_lost(QLOG *qlog,
-                                          const QUIC_TXPIM_PKT *tpkt);
+    const QUIC_TXPIM_PKT *tpkt);
 
 /* transport:packet_sent */
 void ossl_qlog_event_transport_packet_sent(QLOG *qlog,
-                                           const QUIC_PKT_HDR *hdr,
-                                           QUIC_PN pn,
-                                           const OSSL_QTX_IOVEC *iovec,
-                                           size_t numn_iovec,
-                                           uint64_t datagram_id);
+    const QUIC_PKT_HDR *hdr,
+    QUIC_PN pn,
+    const OSSL_QTX_IOVEC *iovec,
+    size_t numn_iovec,
+    uint64_t datagram_id);
 
 /* transport:packet_received */
 void ossl_qlog_event_transport_packet_received(QLOG *qlog,
-                                               const QUIC_PKT_HDR *hdr,
-                                               QUIC_PN pn,
-                                               const OSSL_QTX_IOVEC *iovec,
-                                               size_t numn_iovec,
-                                               uint64_t datagram_id);
+    const QUIC_PKT_HDR *hdr,
+    QUIC_PN pn,
+    const OSSL_QTX_IOVEC *iovec,
+    size_t numn_iovec,
+    uint64_t datagram_id);
 
 #endif
diff --git a/include/internal/quic_ackm.h b/include/internal/quic_ackm.h
index 949d91903bb1..c0617da4855f 100644
--- a/include/internal/quic_ackm.h
+++ b/include/internal/quic_ackm.h
@@ -7,35 +7,35 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_QUIC_ACKM_H
-# define OSSL_QUIC_ACKM_H
+#define OSSL_QUIC_ACKM_H
 
-# include "internal/quic_statm.h"
-# include "internal/quic_cc.h"
-# include "internal/quic_types.h"
-# include "internal/quic_wire.h"
-# include "internal/quic_predef.h"
-# include "internal/time.h"
-# include "internal/list.h"
+#include "internal/quic_statm.h"
+#include "internal/quic_cc.h"
+#include "internal/quic_types.h"
+#include "internal/quic_wire.h"
+#include "internal/quic_predef.h"
+#include "internal/time.h"
+#include "internal/list.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 OSSL_ACKM *ossl_ackm_new(OSSL_TIME (*now)(void *arg),
-                         void *now_arg,
-                         OSSL_STATM *statm,
-                         const OSSL_CC_METHOD *cc_method,
-                         OSSL_CC_DATA *cc_data, int is_server);
+    void *now_arg,
+    OSSL_STATM *statm,
+    const OSSL_CC_METHOD *cc_method,
+    OSSL_CC_DATA *cc_data, int is_server);
 void ossl_ackm_free(OSSL_ACKM *ackm);
 
 void ossl_ackm_set_loss_detection_deadline_callback(OSSL_ACKM *ackm,
-                                                    void (*fn)(OSSL_TIME deadline,
-                                                               void *arg),
-                                                    void *arg);
+    void (*fn)(OSSL_TIME deadline,
+        void *arg),
+    void *arg);
 
 void ossl_ackm_set_ack_deadline_callback(OSSL_ACKM *ackm,
-                                         void (*fn)(OSSL_TIME deadline,
-                                                    int pkt_space,
-                                                    void *arg),
-                                         void *arg);
+    void (*fn)(OSSL_TIME deadline,
+        int pkt_space,
+        void *arg),
+    void *arg);
 
 /*
  * Configures the RX-side maximum ACK delay. This is the maximum amount of time
@@ -81,7 +81,7 @@ struct ossl_ackm_tx_pkt_st {
      * One of the QUIC_PN_SPACE_* values. This qualifies the pkt_num field
      * into a packet number space.
      */
-    unsigned int pkt_space :2;
+    unsigned int pkt_space : 2;
 
     /*
      * 1 if the packet is in flight. A packet is considered 'in flight' if it is
@@ -90,19 +90,19 @@ struct ossl_ackm_tx_pkt_st {
      * numbered packet is not considered in flight is if it contains only ACK
      * frames (not even PADDING frames), as these frames can bypass CC.
      */
-    unsigned int is_inflight :1;
+    unsigned int is_inflight : 1;
 
     /*
      * 1 if the packet has one or more ACK-eliciting frames.
      * Note that if this is set, is_inflight must be set.
      */
-    unsigned int is_ack_eliciting :1;
+    unsigned int is_ack_eliciting : 1;
 
     /* 1 if the packet is a PTO probe. */
-    unsigned int is_pto_probe :1;
+    unsigned int is_pto_probe : 1;
 
     /* 1 if the packet is an MTU probe. */
-    unsigned int is_mtu_probe :1;
+    unsigned int is_mtu_probe : 1;
 
     /* Callback called if frames in this packet are lost. arg is cb_arg. */
     void (*on_lost)(void *arg);
@@ -113,7 +113,7 @@ struct ossl_ackm_tx_pkt_st {
      * is cb_arg.
      */
     void (*on_discarded)(void *arg);
-    void  *cb_arg;
+    void *cb_arg;
 
     /*
      * (Internal use fields; must be zero-initialized.)
@@ -131,10 +131,10 @@ struct ossl_ackm_tx_pkt_st {
 int ossl_ackm_on_tx_packet(OSSL_ACKM *ackm, OSSL_ACKM_TX_PKT *pkt);
 int ossl_ackm_on_rx_datagram(OSSL_ACKM *ackm, size_t num_bytes);
 
-#  define OSSL_ACKM_ECN_NONE      0
-#  define OSSL_ACKM_ECN_ECT1      1
-#  define OSSL_ACKM_ECN_ECT0      2
-#  define OSSL_ACKM_ECN_ECNCE     3
+#define OSSL_ACKM_ECN_NONE 0
+#define OSSL_ACKM_ECN_ECT1 1
+#define OSSL_ACKM_ECN_ECT0 2
+#define OSSL_ACKM_ECN_ECNCE 3
 
 typedef struct ossl_ackm_rx_pkt_st {
     /* The packet number of the received packet. */
@@ -147,22 +147,22 @@ typedef struct ossl_ackm_rx_pkt_st {
      * One of the QUIC_PN_SPACE_* values. This qualifies the pkt_num field
      * into a packet number space.
      */
-    unsigned int pkt_space :2;
+    unsigned int pkt_space : 2;
 
     /* 1 if the packet has one or more ACK-eliciting frames. */
-    unsigned int is_ack_eliciting :1;
+    unsigned int is_ack_eliciting : 1;
 
     /*
      * One of the OSSL_ACKM_ECN_* values. This is the ECN labelling applied to
      * the received packet. If unknown, use OSSL_ACKM_ECN_NONE.
      */
-    unsigned int ecn :2;
+    unsigned int ecn : 2;
 } OSSL_ACKM_RX_PKT;
 
 int ossl_ackm_on_rx_packet(OSSL_ACKM *ackm, const OSSL_ACKM_RX_PKT *pkt);
 
 int ossl_ackm_on_rx_ack_frame(OSSL_ACKM *ackm, const OSSL_QUIC_FRAME_ACK *ack,
-                              int pkt_space, OSSL_TIME rx_time);
+    int pkt_space, OSSL_TIME rx_time);
 
 /*
  * Discards a PN space. This must be called for a PN space before freeing the
@@ -186,7 +186,7 @@ OSSL_TIME ossl_ackm_get_loss_detection_deadline(OSSL_ACKM *ackm);
  * returned by ossl_ackm_get_ack_deadline.
  */
 const OSSL_QUIC_FRAME_ACK *ossl_ackm_get_ack_frame(OSSL_ACKM *ackm,
-                                                   int pkt_space);
+    int pkt_space);
 
 /*
  * Returns the deadline after which an ACK frame should be generated by calling
@@ -280,7 +280,7 @@ int ossl_ackm_get_largest_unacked(OSSL_ACKM *ackm, int pkt_space, QUIC_PN *pn);
  * true loss situation.
  */
 int ossl_ackm_mark_packet_pseudo_lost(OSSL_ACKM *ackm,
-                                      int pkt_space, QUIC_PN pn);
+    int pkt_space, QUIC_PN pn);
 
 /*
  * Returns the PTO duration as currently calculated. This is a quantity of time.
@@ -291,6 +291,6 @@ OSSL_TIME ossl_ackm_get_pto_duration(OSSL_ACKM *ackm);
 /* Returns the largest acked PN in the given PN space. */
 QUIC_PN ossl_ackm_get_largest_acked(OSSL_ACKM *ackm, int pkt_space);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_cc.h b/include/internal/quic_cc.h
index dbd439dd0cf5..94214655c030 100644
--- a/include/internal/quic_cc.h
+++ b/include/internal/quic_cc.h
@@ -7,28 +7,28 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_QUIC_CC_H
-# define OSSL_QUIC_CC_H
+#define OSSL_QUIC_CC_H
 
 #include "openssl/params.h"
 #include "internal/time.h"
 #include "internal/quic_predef.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 typedef struct ossl_cc_ack_info_st {
     /* The time the packet being acknowledged was originally sent. */
-    OSSL_TIME   tx_time;
+    OSSL_TIME tx_time;
 
     /* The size in bytes of the packet being acknowledged. */
-    size_t      tx_size;
+    size_t tx_size;
 } OSSL_CC_ACK_INFO;
 
 typedef struct ossl_cc_loss_info_st {
     /* The time the packet being lost was originally sent. */
-    OSSL_TIME   tx_time;
+    OSSL_TIME tx_time;
 
     /* The size in bytes of the packet which has been determined lost. */
-    size_t      tx_size;
+    size_t tx_size;
 } OSSL_CC_LOSS_INFO;
 
 typedef struct ossl_cc_ecn_info_st {
@@ -36,23 +36,23 @@ typedef struct ossl_cc_ecn_info_st {
      * The time at which the largest acked PN (in the incoming ACK frame) was
      * sent.
      */
-    OSSL_TIME   largest_acked_time;
+    OSSL_TIME largest_acked_time;
 } OSSL_CC_ECN_INFO;
 
 /* Parameter (read-write): Maximum datagram payload length in bytes. */
-#define OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN        "max_dgram_payload_len"
+#define OSSL_CC_OPTION_MAX_DGRAM_PAYLOAD_LEN "max_dgram_payload_len"
 
 /* Diagnostic (read-only): current congestion window size in bytes. */
-#define OSSL_CC_OPTION_CUR_CWND_SIZE                "cur_cwnd_size"
+#define OSSL_CC_OPTION_CUR_CWND_SIZE "cur_cwnd_size"
 
 /* Diagnostic (read-only): minimum congestion window size in bytes. */
-#define OSSL_CC_OPTION_MIN_CWND_SIZE                "min_cwnd_size"
+#define OSSL_CC_OPTION_MIN_CWND_SIZE "min_cwnd_size"
 
 /* Diagnostic (read-only): current net bytes in flight. */
-#define OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT          "bytes_in_flight"
+#define OSSL_CC_OPTION_CUR_BYTES_IN_FLIGHT "bytes_in_flight"
 
 /* Diagnostic (read-only): method-specific state value. */
-#define OSSL_CC_OPTION_CUR_STATE                    "cur_state"
+#define OSSL_CC_OPTION_CUR_STATE "cur_state"
 
 /*
  * Congestion control abstract interface.
@@ -77,14 +77,14 @@ typedef struct ossl_cc_ecn_info_st {
  * All of these changes are intended to avoid having a congestion controller
  * have to access ACKM internal state.
  */
-#define OSSL_CC_LOST_FLAG_PERSISTENT_CONGESTION     (1U << 0)
+#define OSSL_CC_LOST_FLAG_PERSISTENT_CONGESTION (1U << 0)
 
 struct ossl_cc_method_st {
     /*
      * Instantiation.
      */
     OSSL_CC_DATA *(*new)(OSSL_TIME (*now_cb)(void *arg),
-                         void *now_cb_arg);
+        void *now_cb_arg);
 
     void (*free)(OSSL_CC_DATA *ccdata);
 
@@ -101,7 +101,7 @@ struct ossl_cc_method_st {
      * Returns 1 on success and 0 on failure.
      */
     int (*set_input_params)(OSSL_CC_DATA *ccdata,
-                            const OSSL_PARAM *params);
+        const OSSL_PARAM *params);
 
     /*
      * (Re)bind output (diagnostic) information.
@@ -118,7 +118,7 @@ struct ossl_cc_method_st {
      * Returns 1 on success and 0 on failure.
      */
     int (*bind_diagnostics)(OSSL_CC_DATA *ccdata,
-                            OSSL_PARAM *params);
+        OSSL_PARAM *params);
 
     /*
      * Unbind diagnostic information. The parameters with the given names are
@@ -130,7 +130,7 @@ struct ossl_cc_method_st {
      * Returns 1 on success or 0 on failure.
      */
     int (*unbind_diagnostics)(OSSL_CC_DATA *ccdata,
-                              OSSL_PARAM *params);
+        OSSL_PARAM *params);
 
     /*
      * Returns the amount of additional data (above and beyond the data
@@ -154,14 +154,14 @@ struct ossl_cc_method_st {
      * sent).
      */
     int (*on_data_sent)(OSSL_CC_DATA *ccdata,
-                        uint64_t num_bytes);
+        uint64_t num_bytes);
 
     /*
      * The On Data Acked event. See OSSL_CC_ACK_INFO structure for details
      * of the information to be passed.
      */
     int (*on_data_acked)(OSSL_CC_DATA *ccdata,
-                         const OSSL_CC_ACK_INFO *info);
+        const OSSL_CC_ACK_INFO *info);
 
     /*
      * The On Data Lost event. See OSSL_CC_LOSS_INFO structure for details
@@ -177,7 +177,7 @@ struct ossl_cc_method_st {
      * calls to on_data_lost().
      */
     int (*on_data_lost)(OSSL_CC_DATA *ccdata,
-                        const OSSL_CC_LOSS_INFO *info);
+        const OSSL_CC_LOSS_INFO *info);
 
     /*
      * To be called after a sequence of one or more on_data_lost() calls
@@ -193,7 +193,7 @@ struct ossl_cc_method_st {
      * Only the size of the packet is needed.
      */
     int (*on_data_invalidated)(OSSL_CC_DATA *ccdata,
-                               uint64_t num_bytes);
+        uint64_t num_bytes);
 
     /*
      * Called from the ACKM when detecting an increased ECN-CE value in an ACK
@@ -207,12 +207,12 @@ struct ossl_cc_method_st {
      * narrower interface between the ACKM and CC.
      */
     int (*on_ecn)(OSSL_CC_DATA *ccdata,
-                  const OSSL_CC_ECN_INFO *info);
+        const OSSL_CC_ECN_INFO *info);
 };
 
 extern const OSSL_CC_METHOD ossl_cc_dummy_method;
 extern const OSSL_CC_METHOD ossl_cc_newreno_method;
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_cfq.h b/include/internal/quic_cfq.h
index 56ebcb930ed6..0b2a3a4cb2d6 100644
--- a/include/internal/quic_cfq.h
+++ b/include/internal/quic_cfq.h
@@ -8,13 +8,13 @@
  */
 
 #ifndef OSSL_QUIC_CFQ_H
-# define OSSL_QUIC_CFQ_H
+#define OSSL_QUIC_CFQ_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Control Frame Queue Item
@@ -31,16 +31,16 @@ struct quic_cfq_item_st {
      * TXPIM in keeping a list of GCR control frames which were sent in a
      * packet. They may be used for any purpose.
      */
-    QUIC_CFQ_ITEM  *pkt_prev, *pkt_next;
+    QUIC_CFQ_ITEM *pkt_prev, *pkt_next;
 
     /* All other fields are private; use ossl_quic_cfq_item_* accessors. */
 };
 
-#  define QUIC_CFQ_STATE_NEW      0
-#  define QUIC_CFQ_STATE_TX       1
+#define QUIC_CFQ_STATE_NEW 0
+#define QUIC_CFQ_STATE_TX 1
 
 /* If set, do not retransmit on loss */
-#define QUIC_CFQ_ITEM_FLAG_UNRELIABLE   (1U << 0)
+#define QUIC_CFQ_ITEM_FLAG_UNRELIABLE (1U << 0)
 
 /* Returns the frame type of a CFQ item. */
 uint64_t ossl_quic_cfq_item_get_frame_type(const QUIC_CFQ_ITEM *item);
@@ -97,17 +97,17 @@ void ossl_quic_cfq_free(QUIC_CFQ *cfq);
  *
  * flags is zero or more QUIC_CFQ_ITEM_FLAG values.
  */
-typedef void (cfq_free_cb)(unsigned char *buf, size_t buf_len, void *arg);
+typedef void(cfq_free_cb)(unsigned char *buf, size_t buf_len, void *arg);
 
-QUIC_CFQ_ITEM *ossl_quic_cfq_add_frame(QUIC_CFQ            *cfq,
-                                       uint32_t             priority,
-                                       uint32_t             pn_space,
-                                       uint64_t             frame_type,
-                                       uint32_t             flags,
-                                       const unsigned char *encoded,
-                                       size_t               encoded_len,
-                                       cfq_free_cb         *free_cb,
-                                       void                *free_cb_arg);
+QUIC_CFQ_ITEM *ossl_quic_cfq_add_frame(QUIC_CFQ *cfq,
+    uint32_t priority,
+    uint32_t pn_space,
+    uint64_t frame_type,
+    uint32_t flags,
+    const unsigned char *encoded,
+    size_t encoded_len,
+    cfq_free_cb *free_cb,
+    void *free_cb_arg);
 
 /*
  * Effects an immediate transition of the given CFQ item to the TX state.
@@ -120,7 +120,7 @@ void ossl_quic_cfq_mark_tx(QUIC_CFQ *cfq, QUIC_CFQ_ITEM *item);
  * the priority is changed to the given value.
  */
 void ossl_quic_cfq_mark_lost(QUIC_CFQ *cfq, QUIC_CFQ_ITEM *item,
-                             uint32_t priority);
+    uint32_t priority);
 
 /*
  * Releases a CFQ item. The item may be in either state (NEW or TX) prior to the
@@ -138,7 +138,7 @@ void ossl_quic_cfq_release(QUIC_CFQ *cfq, QUIC_CFQ_ITEM *item);
  * transmission. If there are none, returns NULL.
  */
 QUIC_CFQ_ITEM *ossl_quic_cfq_get_priority_head(const QUIC_CFQ *cfq,
-                                               uint32_t pn_space);
+    uint32_t pn_space);
 
 /*
  * Given a CFQ item, gets the next CFQ item awaiting transmission in priority
@@ -147,8 +147,8 @@ QUIC_CFQ_ITEM *ossl_quic_cfq_get_priority_head(const QUIC_CFQ *cfq,
  * Returns NULL if the given item is the last item in priority order.
  */
 QUIC_CFQ_ITEM *ossl_quic_cfq_item_get_priority_next(const QUIC_CFQ_ITEM *item,
-                                                    uint32_t pn_space);
+    uint32_t pn_space);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h
index 4476481fef9b..b917b966abeb 100644
--- a/include/internal/quic_channel.h
+++ b/include/internal/quic_channel.h
@@ -8,18 +8,18 @@
  */
 
 #ifndef OSSL_QUIC_CHANNEL_H
-# define OSSL_QUIC_CHANNEL_H
+#define OSSL_QUIC_CHANNEL_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_record_tx.h"
-# include "internal/quic_wire.h"
-# include "internal/quic_predef.h"
-# include "internal/qlog.h"
-# include "internal/time.h"
-# include "internal/thread.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_record_tx.h"
+#include "internal/quic_wire.h"
+#include "internal/quic_predef.h"
+#include "internal/qlog.h"
+#include "internal/time.h"
+#include "internal/thread.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Channel
@@ -71,7 +71,7 @@
  *
  *   Precondition: must hold channel mutex (unchecked)
  */
-#  define QUIC_NEEDS_LOCK
+#define QUIC_NEEDS_LOCK
 
 /*
  * The function acquires the channel mutex and releases it before returning in
@@ -83,7 +83,7 @@
  *   Precondition: must not hold channel mutex (unchecked)
  *   Postcondition: channel mutex is not held (by calling thread)
  */
-#  define QUIC_TAKES_LOCK
+#define QUIC_TAKES_LOCK
 
 /*
  * The function acquires the channel mutex and leaves it acquired
@@ -96,38 +96,38 @@
  *   Postcondition: channel mutex is held by calling thread
  *      or function returned failure
  */
-#  define QUIC_ACQUIRES_LOCK
+#define QUIC_ACQUIRES_LOCK
 
-#  define QUIC_TODO_LOCK
+#define QUIC_TODO_LOCK
 
-#  define QUIC_CHANNEL_STATE_IDLE                        0
-#  define QUIC_CHANNEL_STATE_ACTIVE                      1
-#  define QUIC_CHANNEL_STATE_TERMINATING_CLOSING         2
-#  define QUIC_CHANNEL_STATE_TERMINATING_DRAINING        3
-#  define QUIC_CHANNEL_STATE_TERMINATED                  4
+#define QUIC_CHANNEL_STATE_IDLE 0
+#define QUIC_CHANNEL_STATE_ACTIVE 1
+#define QUIC_CHANNEL_STATE_TERMINATING_CLOSING 2
+#define QUIC_CHANNEL_STATE_TERMINATING_DRAINING 3
+#define QUIC_CHANNEL_STATE_TERMINATED 4
 
 typedef struct quic_channel_args_st {
     /*
      * The QUIC_PORT which the channel is to belong to. The lifetime of the
      * QUIC_PORT must exceed that of the created channel.
      */
-    QUIC_PORT       *port;
+    QUIC_PORT *port;
     /* LCIDM to register LCIDs with. */
-    QUIC_LCIDM      *lcidm;
+    QUIC_LCIDM *lcidm;
     /* SRTM to register SRTs with. */
-    QUIC_SRTM       *srtm;
-    OSSL_QRX        *qrx;
+    QUIC_SRTM *srtm;
+    OSSL_QRX *qrx;
 
-    int             is_server;
-    SSL             *tls;
+    int is_server;
+    SSL *tls;
 
     /* Whether to use qlog. */
-    int             use_qlog;
+    int use_qlog;
 
-    int             is_tserver_ch;
+    int is_tserver_ch;
 
     /* Title to use for the qlog session, or NULL. */
-    const char      *qlog_title;
+    const char *qlog_title;
 } QUIC_CHANNEL_ARGS;
 
 /* Represents the cause for a connection's termination. */
@@ -137,13 +137,13 @@ typedef struct quic_terminate_cause_st {
      * associated with the error. This field is valid iff we are in the
      * TERMINATING or TERMINATED states.
      */
-    uint64_t                        error_code;
+    uint64_t error_code;
 
     /*
      * If terminate_app is set and this is nonzero, this is the frame type which
      * caused the connection to be terminated.
      */
-    uint64_t                        frame_type;
+    uint64_t frame_type;
 
     /*
      * Optional reason string. When calling ossl_quic_channel_local_close, if a
@@ -152,16 +152,16 @@ typedef struct quic_terminate_cause_st {
      * Thus the string pointed to by this value, if non-NULL, is valid for the
      * lifetime of the QUIC_CHANNEL object.
      */
-    const char                      *reason;
+    const char *reason;
 
     /*
      * Length of reason in bytes. The reason is supposed to contain a UTF-8
      * string but may be arbitrary data if the reason came from the network.
      */
-    size_t                          reason_len;
+    size_t reason_len;
 
     /* Is this error code in the transport (0) or application (1) space? */
-    unsigned int                    app : 1;
+    unsigned int app : 1;
 
     /*
      * If set, the cause of the termination is a received CONNECTION_CLOSE
@@ -169,7 +169,7 @@ typedef struct quic_terminate_cause_st {
      * CONNECTION_CLOSE frame (regardless of whether the peer later also sends
      * one).
      */
-    unsigned int                    remote : 1;
+    unsigned int remote : 1;
 } QUIC_TERMINATE_CAUSE;
 
 /*
@@ -182,15 +182,14 @@ QUIC_CHANNEL *ossl_quic_channel_alloc(const QUIC_CHANNEL_ARGS *args);
 int ossl_quic_channel_init(QUIC_CHANNEL *ch);
 void ossl_quic_channel_bind_qrx(QUIC_CHANNEL *tserver_ch, OSSL_QRX *qrx);
 
-
 /* No-op if ch is NULL. */
 void ossl_quic_channel_free(QUIC_CHANNEL *ch);
 
 /* Set mutator callbacks for test framework support */
 int ossl_quic_channel_set_mutator(QUIC_CHANNEL *ch,
-                                  ossl_mutate_packet_cb mutatecb,
-                                  ossl_finish_mutate_cb finishmutatecb,
-                                  void *mutatearg);
+    ossl_mutate_packet_cb mutatecb,
+    ossl_finish_mutate_cb finishmutatecb,
+    void *mutatearg);
 
 /*
  * Connection Lifecycle Events
@@ -212,14 +211,14 @@ int ossl_quic_channel_start(QUIC_CHANNEL *ch);
 
 /* Start a locally initiated connection shutdown. */
 void ossl_quic_channel_local_close(QUIC_CHANNEL *ch, uint64_t app_error_code,
-                                   const char *app_reason);
+    const char *app_reason);
 
 /**
  * @brief schedules a NEW_TOKEN frame for sending on the channel
  */
 int ossl_quic_channel_schedule_new_token(QUIC_CHANNEL *ch,
-                                         const unsigned char *token,
-                                         size_t token_len);
+    const unsigned char *token,
+    size_t token_len);
 
 /*
  * Called when the handshake is confirmed.
@@ -241,32 +240,31 @@ int ossl_quic_channel_on_handshake_confirmed(QUIC_CHANNEL *ch);
  * error.
  */
 void ossl_quic_channel_raise_protocol_error_loc(QUIC_CHANNEL *ch,
-                                                uint64_t error_code,
-                                                uint64_t frame_type,
-                                                const char *reason,
-                                                ERR_STATE *err_state,
-                                                const char *src_file,
-                                                int src_line,
-                                                const char *src_func);
+    uint64_t error_code,
+    uint64_t frame_type,
+    const char *reason,
+    ERR_STATE *err_state,
+    const char *src_file,
+    int src_line,
+    const char *src_func);
 
 #define ossl_quic_channel_raise_protocol_error(ch, error_code, frame_type, reason) \
-    ossl_quic_channel_raise_protocol_error_loc((ch), (error_code),  \
-                                               (frame_type),        \
-                                               (reason),            \
-                                               NULL,                \
-                                               OPENSSL_FILE,        \
-                                               OPENSSL_LINE,        \
-                                               OPENSSL_FUNC)
+    ossl_quic_channel_raise_protocol_error_loc((ch), (error_code),                 \
+        (frame_type),                                                              \
+        (reason),                                                                  \
+        NULL,                                                                      \
+        OPENSSL_FILE,                                                              \
+        OPENSSL_LINE,                                                              \
+        OPENSSL_FUNC)
 
 #define ossl_quic_channel_raise_protocol_error_state(ch, error_code, frame_type, reason, state) \
-    ossl_quic_channel_raise_protocol_error_loc((ch), (error_code),  \
-                                               (frame_type),        \
-                                               (reason),            \
-                                               (state),             \
-                                               OPENSSL_FILE,        \
-                                               OPENSSL_LINE,        \
-                                               OPENSSL_FUNC)
-
+    ossl_quic_channel_raise_protocol_error_loc((ch), (error_code),                              \
+        (frame_type),                                                                           \
+        (reason),                                                                               \
+        (state),                                                                                \
+        OPENSSL_FILE,                                                                           \
+        OPENSSL_LINE,                                                                           \
+        OPENSSL_FUNC)
 
 /*
  * Returns 1 if permanent net error was detected on the QUIC_CHANNEL,
@@ -279,18 +277,18 @@ void ossl_quic_channel_restore_err_state(QUIC_CHANNEL *ch);
 
 /* For RXDP use. */
 void ossl_quic_channel_on_remote_conn_close(QUIC_CHANNEL *ch,
-                                            OSSL_QUIC_FRAME_CONN_CLOSE *f);
+    OSSL_QUIC_FRAME_CONN_CLOSE *f);
 void ossl_quic_channel_on_new_conn_id(QUIC_CHANNEL *ch,
-                                      OSSL_QUIC_FRAME_NEW_CONN_ID *f);
+    OSSL_QUIC_FRAME_NEW_CONN_ID *f);
 
 /* Temporarily exposed during QUIC_PORT transition. */
 int ossl_quic_channel_on_new_conn(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
-                                  const QUIC_CONN_ID *peer_scid,
-                                  const QUIC_CONN_ID *peer_dcid);
+    const QUIC_CONN_ID *peer_scid,
+    const QUIC_CONN_ID *peer_dcid);
 
 /* For use by QUIC_PORT. You should not need to call this directly. */
 void ossl_quic_channel_subtick(QUIC_CHANNEL *ch, QUIC_TICK_RESULT *r,
-                               uint32_t flags);
+    uint32_t flags);
 
 /* For use by QUIC_PORT only. */
 void ossl_quic_channel_raise_net_error(QUIC_CHANNEL *ch);
@@ -334,7 +332,7 @@ int ossl_quic_channel_set_peer_addr(QUIC_CHANNEL *ch, const BIO_ADDR *peer_addr)
  * exist.
  */
 QUIC_STREAM *ossl_quic_channel_get_stream_by_id(QUIC_CHANNEL *ch,
-                                                uint64_t stream_id);
+    uint64_t stream_id);
 
 /* Returns 1 if channel is terminating or terminated. */
 int ossl_quic_channel_is_term_any(const QUIC_CHANNEL *ch);
@@ -381,7 +379,7 @@ QUIC_STREAM *ossl_quic_channel_new_stream_local(QUIC_CHANNEL *ch, int is_uni);
  * also returned. Returns NULL on failure.
  */
 QUIC_STREAM *ossl_quic_channel_new_stream_remote(QUIC_CHANNEL *ch,
-                                                 uint64_t stream_id);
+    uint64_t stream_id);
 
 /*
  * Configures incoming stream auto-reject. If enabled, incoming streams have
@@ -390,8 +388,8 @@ QUIC_STREAM *ossl_quic_channel_new_stream_remote(QUIC_CHANNEL *ch,
  * code to be used for those frames.
  */
 void ossl_quic_channel_set_incoming_stream_auto_reject(QUIC_CHANNEL *ch,
-                                                       int enable,
-                                                       uint64_t aec);
+    int enable,
+    uint64_t aec);
 
 /*
  * Causes the channel to reject the sending and receiving parts of a stream,
@@ -402,18 +400,18 @@ void ossl_quic_channel_reject_stream(QUIC_CHANNEL *ch, QUIC_STREAM *qs);
 
 /* Replace local connection ID in TXP and DEMUX for testing purposes. */
 int ossl_quic_channel_replace_local_cid(QUIC_CHANNEL *ch,
-                                        const QUIC_CONN_ID *conn_id);
+    const QUIC_CONN_ID *conn_id);
 
 /* Setters for the msg_callback and msg_callback_arg */
 void ossl_quic_channel_set_msg_callback(QUIC_CHANNEL *ch,
-                                        ossl_msg_cb msg_callback,
-                                        SSL *msg_callback_ssl);
+    ossl_msg_cb msg_callback,
+    SSL *msg_callback_ssl);
 void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch,
-                                            void *msg_callback_arg);
+    void *msg_callback_arg);
 
 /* Testing use only - sets a TXKU threshold packet count override value. */
 void ossl_quic_channel_set_txku_threshold_override(QUIC_CHANNEL *ch,
-                                                   uint64_t tx_pkt_threshold);
+    uint64_t tx_pkt_threshold);
 
 /* Testing use only - gets current 1-RTT key epochs for QTX and QRX. */
 uint64_t ossl_quic_channel_get_tx_key_epoch(QUIC_CHANNEL *ch);
@@ -448,9 +446,9 @@ int ossl_quic_channel_is_new_local_stream_admissible(QUIC_CHANNEL *ch, int is_un
  * on flow control.
  */
 uint64_t ossl_quic_channel_get_local_stream_count_avail(const QUIC_CHANNEL *ch,
-                                                        int is_uni);
+    int is_uni);
 uint64_t ossl_quic_channel_get_remote_stream_count_avail(const QUIC_CHANNEL *ch,
-                                                         int is_uni);
+    int is_uni);
 
 /*
  * Returns 1 if we have generated our local transport parameters yet.
@@ -467,9 +465,9 @@ uint64_t ossl_quic_channel_get_max_idle_timeout_peer_request(const QUIC_CHANNEL
 uint64_t ossl_quic_channel_get_max_idle_timeout_actual(const QUIC_CHANNEL *ch);
 
 int ossl_quic_bind_channel(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
-                           const QUIC_CONN_ID *scid, const QUIC_CONN_ID *dcid,
-                           const QUIC_CONN_ID *odcid);
+    const QUIC_CONN_ID *scid, const QUIC_CONN_ID *dcid,
+    const QUIC_CONN_ID *odcid);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_demux.h b/include/internal/quic_demux.h
index d0781e61cf0f..a1bb344dc468 100644
--- a/include/internal/quic_demux.h
+++ b/include/internal/quic_demux.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OSSL_QUIC_DEMUX_H
-# define OSSL_QUIC_DEMUX_H
+#define OSSL_QUIC_DEMUX_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
-# include "internal/bio_addr.h"
-# include "internal/time.h"
-# include "internal/list.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
+#include "internal/bio_addr.h"
+#include "internal/time.h"
+#include "internal/list.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Demuxer
@@ -84,7 +84,7 @@
  */
 
 /* Maximum number of packets we allow to exist in one datagram. */
-#define QUIC_MAX_PKT_PER_URXE       (sizeof(uint64_t) * 8)
+#define QUIC_MAX_PKT_PER_URXE (sizeof(uint64_t) * 8)
 
 struct quic_urxe_st {
     OSSL_LIST_MEMBER(urxe, QUIC_URXE);
@@ -97,45 +97,45 @@ struct quic_urxe_st {
      * should not be common as we will have a good idea of worst-case MTUs up
      * front.
      */
-    size_t          data_len, alloc_len;
+    size_t data_len, alloc_len;
 
     /*
      * Bitfields per packet. processed indicates the packet has been processed
      * and must not be processed again, hpr_removed indicates header protection
      * has already been removed. Used by QRX only; not used by the demuxer.
      */
-    uint64_t        processed, hpr_removed;
+    uint64_t processed, hpr_removed;
 
     /*
      * This monotonically increases with each datagram received. It is used for
      * diagnostic purposes only.
      */
-    uint64_t        datagram_id;
+    uint64_t datagram_id;
 
     /*
      * Address of peer we received the datagram from, and the local interface
      * address we received it on. If local address support is not enabled, local
      * is zeroed.
      */
-    BIO_ADDR        peer, local;
+    BIO_ADDR peer, local;
 
     /*
      * Time at which datagram was received (or ossl_time_zero()) if a now
      * function was not provided).
      */
-    OSSL_TIME       time;
+    OSSL_TIME time;
 
     /*
      * Used by the QRX to mark whether a datagram has been deferred. Used by the
      * QRX only; not used by the demuxer.
      */
-    char            deferred;
+    char deferred;
 
     /*
      * Used by the DEMUX to track if a URXE has been handed out. Used primarily
      * for debugging purposes.
      */
-    char            demux_state;
+    char demux_state;
 };
 
 /* Accessors for URXE buffer. */
@@ -180,8 +180,8 @@ void ossl_quic_urxe_insert_tail(QUIC_URXE_LIST *l, QUIC_URXE *e);
  * At the time the callback is made, the URXE will not be in any queue,
  * therefore the callee can use the prev and next fields as it wishes.
  */
-typedef void (ossl_quic_demux_cb_fn)(QUIC_URXE *e, void *arg,
-                                     const QUIC_CONN_ID *dcid);
+typedef void(ossl_quic_demux_cb_fn)(QUIC_URXE *e, void *arg,
+    const QUIC_CONN_ID *dcid);
 
 /*
  * Creates a new demuxer. The given BIO is used to receive datagrams from the
@@ -196,9 +196,9 @@ typedef void (ossl_quic_demux_cb_fn)(QUIC_URXE *e, void *arg,
  * NULL, ossl_time_zero() is used as the datagram reception time.
  */
 QUIC_DEMUX *ossl_quic_demux_new(BIO *net_bio,
-                                size_t short_conn_id_len,
-                                OSSL_TIME (*now)(void *arg),
-                                void *now_arg);
+    size_t short_conn_id_len,
+    OSSL_TIME (*now)(void *arg),
+    void *now_arg);
 
 /*
  * Destroy a demuxer. All URXEs must have been released back to the demuxer
@@ -228,8 +228,8 @@ int ossl_quic_demux_set_mtu(QUIC_DEMUX *demux, unsigned int mtu);
  * the future, which may or may not be before the handler returns.
  */
 void ossl_quic_demux_set_default_handler(QUIC_DEMUX *demux,
-                                         ossl_quic_demux_cb_fn *cb,
-                                         void *cb_arg);
+    ossl_quic_demux_cb_fn *cb,
+    void *cb_arg);
 
 /*
  * Releases a URXE back to the demuxer. No reference must be made to the URXE or
@@ -237,7 +237,7 @@ void ossl_quic_demux_set_default_handler(QUIC_DEMUX *demux,
  * that is, its prev and next pointers must be NULL.
  */
 void ossl_quic_demux_release_urxe(QUIC_DEMUX *demux,
-                                  QUIC_URXE *e);
+    QUIC_URXE *e);
 
 /*
  * Reinjects a URXE which was issued to a registered DCID callback or the
@@ -251,7 +251,7 @@ void ossl_quic_demux_release_urxe(QUIC_DEMUX *demux,
  * immediately.
  */
 void ossl_quic_demux_reinject_urxe(QUIC_DEMUX *demux,
-                                   QUIC_URXE *e);
+    QUIC_URXE *e);
 
 /*
  * Process any unprocessed RX'd datagrams, by calling registered callbacks by
@@ -273,9 +273,9 @@ void ossl_quic_demux_reinject_urxe(QUIC_DEMUX *demux,
  *         similarly to in the case of a protocol violation.
  *
  */
-#define QUIC_DEMUX_PUMP_RES_OK              1
-#define QUIC_DEMUX_PUMP_RES_TRANSIENT_FAIL  (-1)
-#define QUIC_DEMUX_PUMP_RES_PERMANENT_FAIL  (-2)
+#define QUIC_DEMUX_PUMP_RES_OK 1
+#define QUIC_DEMUX_PUMP_RES_TRANSIENT_FAIL (-1)
+#define QUIC_DEMUX_PUMP_RES_PERMANENT_FAIL (-2)
 
 int ossl_quic_demux_pump(QUIC_DEMUX *demux);
 
@@ -289,16 +289,16 @@ int ossl_quic_demux_pump(QUIC_DEMUX *demux);
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_demux_inject(QUIC_DEMUX *demux,
-                           const unsigned char *buf,
-                           size_t buf_len,
-                           const BIO_ADDR *peer,
-                           const BIO_ADDR *local);
+    const unsigned char *buf,
+    size_t buf_len,
+    const BIO_ADDR *peer,
+    const BIO_ADDR *local);
 
 /*
  * Returns 1 if there are any pending URXEs.
  */
 int ossl_quic_demux_has_pending(const QUIC_DEMUX *demux);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_engine.h b/include/internal/quic_engine.h
index 23e3fd4932eb..30feb03b7f42 100644
--- a/include/internal/quic_engine.h
+++ b/include/internal/quic_engine.h
@@ -7,15 +7,15 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_QUIC_ENGINE_H
-# define OSSL_QUIC_ENGINE_H
+#define OSSL_QUIC_ENGINE_H
 
-# include <openssl/ssl.h>
+#include <openssl/ssl.h>
 
-# include "internal/quic_predef.h"
-# include "internal/quic_port.h"
-# include "internal/thread_arch.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_port.h"
+#include "internal/thread_arch.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Engine
@@ -37,8 +37,8 @@
  * clock management, the QUIC_REACTOR instance, etc.).
  */
 typedef struct quic_engine_args_st {
-    OSSL_LIB_CTX    *libctx;
-    const char      *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /*
      * This must be a mutex the lifetime of which will exceed that of the engine
@@ -51,10 +51,10 @@ typedef struct quic_engine_args_st {
      * may, depending on the build configuration, be implemented using an OS's
      * mutex primitive or using its RW mutex primitive.
      */
-    CRYPTO_MUTEX    *mutex;
+    CRYPTO_MUTEX *mutex;
 
     /* Flags to pass when initialising the reactor. */
-    uint64_t        reactor_flags;
+    uint64_t reactor_flags;
 } QUIC_ENGINE_ARGS;
 
 QUIC_ENGINE *ossl_quic_engine_new(const QUIC_ENGINE_ARGS *args);
@@ -65,7 +65,7 @@ void ossl_quic_engine_free(QUIC_ENGINE *qeng);
  * Create a port which is a child of the engine. args->engine shall be NULL.
  */
 QUIC_PORT *ossl_quic_engine_create_port(QUIC_ENGINE *qeng,
-                                        const QUIC_PORT_ARGS *args);
+    const QUIC_PORT_ARGS *args);
 
 /* Gets the mutex used by the engine. */
 CRYPTO_MUTEX *ossl_quic_engine_get0_mutex(QUIC_ENGINE *qeng);
@@ -82,8 +82,8 @@ OSSL_TIME ossl_quic_engine_make_real_time(QUIC_ENGINE *qeng, OSSL_TIME tm);
 
 /* Override the callback for getting the current time */
 void ossl_quic_engine_set_time_cb(QUIC_ENGINE *qeng,
-                                  OSSL_TIME (*now_cb)(void *arg),
-                                  void *now_cb_arg);
+    OSSL_TIME (*now_cb)(void *arg),
+    void *now_cb_arg);
 
 /* For testing use. While enabled, ticking is not performed. */
 void ossl_quic_engine_set_inhibit_tick(QUIC_ENGINE *qeng, int inhibit);
@@ -102,6 +102,6 @@ const char *ossl_quic_engine_get0_propq(QUIC_ENGINE *qeng);
  */
 void ossl_quic_engine_update_poll_descriptors(QUIC_ENGINE *qeng, int force);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_error.h b/include/internal/quic_error.h
index 86d1c692b4f0..44895f77f6a8 100644
--- a/include/internal/quic_error.h
+++ b/include/internal/quic_error.h
@@ -8,24 +8,24 @@
  */
 
 #ifndef OSSL_QUIC_ERROR_H
-# define OSSL_QUIC_ERROR_H
+#define OSSL_QUIC_ERROR_H
 
-# include <openssl/ssl.h>
-# include <openssl/quic.h>
+#include <openssl/ssl.h>
+#include <openssl/quic.h>
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
-#  define OSSL_QUIC_ERR_CRYPTO_UNEXPECTED_MESSAGE \
+#define OSSL_QUIC_ERR_CRYPTO_UNEXPECTED_MESSAGE \
     OSSL_QUIC_ERR_CRYPTO_ERR(SSL3_AD_UNEXPECTED_MESSAGE)
 
-#  define OSSL_QUIC_ERR_CRYPTO_MISSING_EXT \
+#define OSSL_QUIC_ERR_CRYPTO_MISSING_EXT \
     OSSL_QUIC_ERR_CRYPTO_ERR(TLS13_AD_MISSING_EXTENSION)
 
-#  define OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO \
+#define OSSL_QUIC_ERR_CRYPTO_NO_APP_PROTO \
     OSSL_QUIC_ERR_CRYPTO_ERR(TLS1_AD_NO_APPLICATION_PROTOCOL)
 
 const char *ossl_quic_err_to_string(uint64_t error_code);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_fc.h b/include/internal/quic_fc.h
index 923bd43bc328..007e84dd9a9e 100644
--- a/include/internal/quic_fc.h
+++ b/include/internal/quic_fc.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OSSL_QUIC_FC_H
-# define OSSL_QUIC_FC_H
+#define OSSL_QUIC_FC_H
 
-# include <openssl/ssl.h>
-# include "internal/time.h"
+#include <openssl/ssl.h>
+#include "internal/time.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * TX Flow Controller (TXFC)
@@ -24,9 +24,9 @@
 typedef struct quic_txfc_st QUIC_TXFC;
 
 struct quic_txfc_st {
-    QUIC_TXFC   *parent; /* stream-level iff non-NULL */
-    uint64_t    swm, cwm;
-    char        has_become_blocked;
+    QUIC_TXFC *parent; /* stream-level iff non-NULL */
+    uint64_t swm, cwm;
+    char has_become_blocked;
 };
 
 /*
@@ -134,12 +134,12 @@ struct quic_rxfc_st {
      * (STREAM frame offset + payload length) we have seen from a STREAM frame
      * yet.
      */
-    uint64_t        cwm, swm, rwm, esrwm, hwm, cur_window_size, max_window_size;
-    OSSL_TIME       epoch_start;
-    OSSL_TIME       (*now)(void *arg);
-    void            *now_arg;
-    QUIC_RXFC       *parent;
-    unsigned char   error_code, has_cwm_changed, is_fin, standalone;
+    uint64_t cwm, swm, rwm, esrwm, hwm, cur_window_size, max_window_size;
+    OSSL_TIME epoch_start;
+    OSSL_TIME (*now)(void *arg);
+    void *now_arg;
+    QUIC_RXFC *parent;
+    unsigned char error_code, has_cwm_changed, is_fin, standalone;
 };
 
 /*
@@ -151,10 +151,10 @@ struct quic_rxfc_st {
  * to transmit more data at a time.
  */
 int ossl_quic_rxfc_init(QUIC_RXFC *rxfc, QUIC_RXFC *conn_rxfc,
-                        uint64_t initial_window_size,
-                        uint64_t max_window_size,
-                        OSSL_TIME (*now)(void *arg),
-                        void *now_arg);
+    uint64_t initial_window_size,
+    uint64_t max_window_size,
+    OSSL_TIME (*now)(void *arg),
+    void *now_arg);
 
 /*
  * Initialises an RX flow controller which is used by itself and not under a
@@ -162,9 +162,9 @@ int ossl_quic_rxfc_init(QUIC_RXFC *rxfc, QUIC_RXFC *conn_rxfc,
  * enforcement as well as CRYPTO buffer enforcement.
  */
 int ossl_quic_rxfc_init_standalone(QUIC_RXFC *rxfc,
-                                   uint64_t initial_window_size,
-                                   OSSL_TIME (*now)(void *arg),
-                                   void *now_arg);
+    uint64_t initial_window_size,
+    OSSL_TIME (*now)(void *arg),
+    void *now_arg);
 
 /*
  * Gets the parent (i.e., connection-level) RXFC. Returns NULL if called on a
@@ -176,7 +176,7 @@ QUIC_RXFC *ossl_quic_rxfc_get_parent(QUIC_RXFC *rxfc);
  * Changes the current maximum window size value.
  */
 void ossl_quic_rxfc_set_max_window_size(QUIC_RXFC *rxfc,
-                                        size_t max_window_size);
+    size_t max_window_size);
 
 /*
  * To be called whenever a STREAM frame is received.
@@ -197,7 +197,7 @@ void ossl_quic_rxfc_set_max_window_size(QUIC_RXFC *rxfc,
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_rxfc_on_rx_stream_frame(QUIC_RXFC *rxfc,
-                                      uint64_t end, int is_fin);
+    uint64_t end, int is_fin);
 
 /*
  * To be called whenever controlled bytes are retired, i.e. when bytes are
@@ -217,8 +217,8 @@ int ossl_quic_rxfc_on_rx_stream_frame(QUIC_RXFC *rxfc,
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_rxfc_on_retire(QUIC_RXFC *rxfc,
-                             uint64_t num_bytes,
-                             OSSL_TIME rtt);
+    uint64_t num_bytes,
+    OSSL_TIME rtt);
 
 /*
  * Returns the current CWM which the RXFC thinks the peer should have.
@@ -278,6 +278,6 @@ int ossl_quic_rxfc_get_error(QUIC_RXFC *rxfc, int clear);
  */
 int ossl_quic_rxfc_get_final_size(const QUIC_RXFC *rxfc, uint64_t *final_size);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_fifd.h b/include/internal/quic_fifd.h
index c1644e4d8ef2..4ea7a2e0d226 100644
--- a/include/internal/quic_fifd.h
+++ b/include/internal/quic_fifd.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_QUIC_FIFD_H
-# define OSSL_QUIC_FIFD_H
+#define OSSL_QUIC_FIFD_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_cfq.h"
-# include "internal/quic_ackm.h"
-# include "internal/quic_txpim.h"
-# include "internal/quic_stream.h"
-# include "internal/qlog.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_cfq.h"
+#include "internal/quic_ackm.h"
+#include "internal/quic_txpim.h"
+#include "internal/quic_stream.h"
+#include "internal/qlog.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Frame-in-Flight Dispatcher (FIFD)
@@ -26,63 +26,63 @@
  */
 struct quic_fifd_st {
     /* Internal data; use the ossl_quic_fifd functions. */
-    QUIC_CFQ       *cfq;
-    OSSL_ACKM      *ackm;
-    QUIC_TXPIM     *txpim;
+    QUIC_CFQ *cfq;
+    OSSL_ACKM *ackm;
+    QUIC_TXPIM *txpim;
     QUIC_SSTREAM *(*get_sstream_by_id)(uint64_t stream_id,
-                                       uint32_t pn_space,
-                                       void *arg);
-    void           *get_sstream_by_id_arg;
-    void          (*regen_frame)(uint64_t frame_type,
-                                 uint64_t stream_id,
-                                 QUIC_TXPIM_PKT *pkt,
-                                 void *arg);
-    void           *regen_frame_arg;
-    void          (*confirm_frame)(uint64_t frame_type,
-                                   uint64_t stream_id,
-                                   QUIC_TXPIM_PKT *pkt,
-                                   void *arg);
-    void           *confirm_frame_arg;
-    void          (*sstream_updated)(uint64_t stream_id,
-                                   void *arg);
-    void           *sstream_updated_arg;
-    QLOG         *(*get_qlog_cb)(void *arg);
-    void           *get_qlog_cb_arg;
+        uint32_t pn_space,
+        void *arg);
+    void *get_sstream_by_id_arg;
+    void (*regen_frame)(uint64_t frame_type,
+        uint64_t stream_id,
+        QUIC_TXPIM_PKT *pkt,
+        void *arg);
+    void *regen_frame_arg;
+    void (*confirm_frame)(uint64_t frame_type,
+        uint64_t stream_id,
+        QUIC_TXPIM_PKT *pkt,
+        void *arg);
+    void *confirm_frame_arg;
+    void (*sstream_updated)(uint64_t stream_id,
+        void *arg);
+    void *sstream_updated_arg;
+    QLOG *(*get_qlog_cb)(void *arg);
+    void *get_qlog_cb_arg;
 };
 
 int ossl_quic_fifd_init(QUIC_FIFD *fifd,
-                        QUIC_CFQ *cfq,
-                        OSSL_ACKM *ackm,
-                        QUIC_TXPIM *txpim,
-                        /* stream_id is UINT64_MAX for the crypto stream */
-                        QUIC_SSTREAM *(*get_sstream_by_id)(uint64_t stream_id,
-                                                           uint32_t pn_space,
-                                                           void *arg),
-                        void *get_sstream_by_id_arg,
-                        /* stream_id is UINT64_MAX if not applicable */
-                        void (*regen_frame)(uint64_t frame_type,
-                                            uint64_t stream_id,
-                                            QUIC_TXPIM_PKT *pkt,
-                                            void *arg),
-                        void *regen_frame_arg,
-                        void (*confirm_frame)(uint64_t frame_type,
-                                             uint64_t stream_id,
-                                             QUIC_TXPIM_PKT *pkt,
-                                             void *arg),
-                        void *confirm_frame_arg,
-                        void (*sstream_updated)(uint64_t stream_id,
-                                                void *arg),
-                        void *sstream_updated_arg,
-                        QLOG *(*get_qlog_cb)(void *arg),
-                        void *get_qlog_cb_arg);
+    QUIC_CFQ *cfq,
+    OSSL_ACKM *ackm,
+    QUIC_TXPIM *txpim,
+    /* stream_id is UINT64_MAX for the crypto stream */
+    QUIC_SSTREAM *(*get_sstream_by_id)(uint64_t stream_id,
+        uint32_t pn_space,
+        void *arg),
+    void *get_sstream_by_id_arg,
+    /* stream_id is UINT64_MAX if not applicable */
+    void (*regen_frame)(uint64_t frame_type,
+        uint64_t stream_id,
+        QUIC_TXPIM_PKT *pkt,
+        void *arg),
+    void *regen_frame_arg,
+    void (*confirm_frame)(uint64_t frame_type,
+        uint64_t stream_id,
+        QUIC_TXPIM_PKT *pkt,
+        void *arg),
+    void *confirm_frame_arg,
+    void (*sstream_updated)(uint64_t stream_id,
+        void *arg),
+    void *sstream_updated_arg,
+    QLOG *(*get_qlog_cb)(void *arg),
+    void *get_qlog_cb_arg);
 
 void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd); /* (no-op) */
 
 int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt);
 
 void ossl_quic_fifd_set_qlog_cb(QUIC_FIFD *fifd, QLOG *(*get_qlog_cb)(void *arg),
-                                void *arg);
+    void *arg);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_lcidm.h b/include/internal/quic_lcidm.h
index accfe049b52d..66421e8ac1b7 100644
--- a/include/internal/quic_lcidm.h
+++ b/include/internal/quic_lcidm.h
@@ -1,23 +1,23 @@
 /*
-* Copyright 2023-2025 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2023-2025 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_LCIDM_H
-# define OSSL_INTERNAL_QUIC_LCIDM_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_LCIDM_H
+#pragma once
 
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/quic_types.h"
-# include "internal/quic_wire.h"
-# include "internal/quic_predef.h"
+#include "internal/e_os.h"
+#include "internal/time.h"
+#include "internal/quic_types.h"
+#include "internal/quic_wire.h"
+#include "internal/quic_predef.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Local Connection ID Manager
@@ -116,7 +116,7 @@ size_t ossl_quic_lcidm_get_lcid_len(const QUIC_LCIDM *lcidm);
  * reception) currently associated with the given opaque pointer.
  */
 size_t ossl_quic_lcidm_get_num_active_lcid(const QUIC_LCIDM *lcidm,
-                                           void *opaque);
+    void *opaque);
 
 /*
  * Enrol an Initial ODCID sent by the peer. This is the DCID in the first
@@ -141,7 +141,7 @@ size_t ossl_quic_lcidm_get_num_active_lcid(const QUIC_LCIDM *lcidm,
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_lcidm_enrol_odcid(QUIC_LCIDM *lcidm, void *opaque,
-                                const QUIC_CONN_ID *initial_odcid);
+    const QUIC_CONN_ID *initial_odcid);
 
 /*
  * Retire a previously enrolled ODCID for a connection. This is generally done
@@ -163,8 +163,8 @@ int ossl_quic_lcidm_retire_odcid(QUIC_LCIDM *lcidm, void *opaque);
  * May not be called more than once for a given opaque pointer value.
  */
 int ossl_quic_lcidm_generate_initial(QUIC_LCIDM *lcidm,
-                                     void *opaque,
-                                     QUIC_CONN_ID *initial_lcid);
+    void *opaque,
+    QUIC_CONN_ID *initial_lcid);
 
 /*
  * Create a subsequent LCID for a given opaque pointer. The information needed
@@ -178,8 +178,8 @@ int ossl_quic_lcidm_generate_initial(QUIC_LCIDM *lcidm,
  * register the new LCID with a DEMUX and queue the NEW_CONN_ID frame.
  */
 int ossl_quic_lcidm_generate(QUIC_LCIDM *lcidm,
-                             void *opaque,
-                             OSSL_QUIC_FRAME_NEW_CONN_ID *ncid_frame);
+    void *opaque,
+    OSSL_QUIC_FRAME_NEW_CONN_ID *ncid_frame);
 
 /*
  * Retire up to one LCID for a given opaque pointer value. Called repeatedly to
@@ -205,12 +205,12 @@ int ossl_quic_lcidm_generate(QUIC_LCIDM *lcidm,
  * are retired, this is considered a success condition.
  */
 int ossl_quic_lcidm_retire(QUIC_LCIDM *lcidm,
-                           void *opaque,
-                           uint64_t retire_prior_to,
-                           const QUIC_CONN_ID *containing_pkt_dcid,
-                           QUIC_CONN_ID *retired_lcid,
-                           uint64_t *retired_seq_num,
-                           int *did_retire);
+    void *opaque,
+    uint64_t retire_prior_to,
+    const QUIC_CONN_ID *containing_pkt_dcid,
+    QUIC_CONN_ID *retired_lcid,
+    uint64_t *retired_seq_num,
+    int *did_retire);
 
 /*
  * Cull all LCIDM state relating to a given opaque pointer value. This is useful
@@ -228,12 +228,12 @@ int ossl_quic_lcidm_cull(QUIC_LCIDM *lcidm, void *opaque);
  * If the LCID is for an Initial ODCID, *seq_num is set to
  * LCIDM_ODCID_SEQ_NUM.
  */
-#define LCIDM_ODCID_SEQ_NUM     UINT64_MAX
+#define LCIDM_ODCID_SEQ_NUM UINT64_MAX
 
 int ossl_quic_lcidm_lookup(QUIC_LCIDM *lcidm,
-                           const QUIC_CONN_ID *lcid,
-                           uint64_t *seq_num,
-                           void **opaque);
+    const QUIC_CONN_ID *lcid,
+    uint64_t *seq_num,
+    void **opaque);
 
 /*
  * Debug call to manually remove a specific LCID. Should not be needed in normal
@@ -241,7 +241,7 @@ int ossl_quic_lcidm_lookup(QUIC_LCIDM *lcidm,
  * otherwise.
  */
 int ossl_quic_lcidm_debug_remove(QUIC_LCIDM *lcidm,
-                                 const QUIC_CONN_ID *lcid);
+    const QUIC_CONN_ID *lcid);
 
 /*
  * Debug call to manually add a numbered LCID with a specific CID value and
@@ -249,8 +249,8 @@ int ossl_quic_lcidm_debug_remove(QUIC_LCIDM *lcidm,
  * and 0 on failure.
  */
 int ossl_quic_lcidm_debug_add(QUIC_LCIDM *lcidm, void *opaque,
-                              const QUIC_CONN_ID *lcid,
-                              uint64_t seq_num);
+    const QUIC_CONN_ID *lcid,
+    uint64_t seq_num);
 
 /*
  * Obtain a local connection id which is not used yet.
@@ -263,7 +263,7 @@ int ossl_quic_lcidm_get_unused_cid(QUIC_LCIDM *lcidm, QUIC_CONN_ID *cid);
  * This should be connection ID we generated during client validation.
  */
 int ossl_quic_lcidm_bind_channel(QUIC_LCIDM *lcidm, void *opaque,
-                                 const QUIC_CONN_ID *lcid);
-# endif
+    const QUIC_CONN_ID *lcid);
+#endif
 
 #endif
diff --git a/include/internal/quic_port.h b/include/internal/quic_port.h
index 6a4dde81da9b..5a2c9352378b 100644
--- a/include/internal/quic_port.h
+++ b/include/internal/quic_port.h
@@ -7,16 +7,16 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_QUIC_PORT_H
-# define OSSL_QUIC_PORT_H
+#define OSSL_QUIC_PORT_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_reactor.h"
-# include "internal/quic_demux.h"
-# include "internal/quic_predef.h"
-# include "internal/thread_arch.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_reactor.h"
+#include "internal/quic_demux.h"
+#include "internal/quic_predef.h"
+#include "internal/thread_arch.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Port
@@ -40,7 +40,7 @@
  */
 typedef struct quic_port_args_st {
     /* The engine which the QUIC port is to be a child of. */
-    QUIC_ENGINE     *engine;
+    QUIC_ENGINE *engine;
 
     /*
      * This callback allows port_new_handshake_layer to pre-create a quic
@@ -54,19 +54,19 @@ typedef struct quic_port_args_st {
      * This SSL_CTX will be used when constructing the handshake layer object
      * inside newly created channels.
      */
-    SSL_CTX         *channel_ctx;
+    SSL_CTX *channel_ctx;
 
     /*
      * If 1, this port is to be used for multiple connections, so
      * non-zero-length CIDs should be used. If 0, this port will only be used
      * for a single connection, so a zero-length local CID can be used.
      */
-    int             is_multi_conn;
+    int is_multi_conn;
 
     /*
      * if 1, this port should do server address validation
      */
-    int             do_addr_validation;
+    int do_addr_validation;
 } QUIC_PORT_ARGS;
 
 /* Only QUIC_ENGINE should use this function. */
@@ -151,7 +151,7 @@ void ossl_quic_port_restore_err_state(const QUIC_PORT *port);
 
 /* For use by QUIC_ENGINE. You should not need to call this directly. */
 void ossl_quic_port_subtick(QUIC_PORT *port, QUIC_TICK_RESULT *r,
-                            uint32_t flags);
+    uint32_t flags);
 
 /* Returns the number of queued incoming channels. */
 size_t ossl_quic_port_get_num_incoming_channels(const QUIC_PORT *port);
@@ -185,8 +185,8 @@ uint64_t ossl_quic_port_get_net_bio_epoch(const QUIC_PORT *port);
  * a channel which encountered the network error.
  */
 void ossl_quic_port_raise_net_error(QUIC_PORT *port,
-                                    QUIC_CHANNEL *triggering_ch);
+    QUIC_CHANNEL *triggering_ch);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_predef.h b/include/internal/quic_predef.h
index 657d86329c6e..c8d4ad470f58 100644
--- a/include/internal/quic_predef.h
+++ b/include/internal/quic_predef.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_QUIC_PREDEF_H
-# define OSSL_QUIC_PREDEF_H
+#define OSSL_QUIC_PREDEF_H
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 typedef struct ssl_token_store_st SSL_TOKEN_STORE;
 typedef struct quic_port_st QUIC_PORT;
@@ -45,6 +45,6 @@ typedef struct quic_xso_st QUIC_XSO;
 typedef struct quic_listener_st QUIC_LISTENER;
 typedef struct quic_domain_st QUIC_DOMAIN;
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_rcidm.h b/include/internal/quic_rcidm.h
index fd102241b294..aa734f364331 100644
--- a/include/internal/quic_rcidm.h
+++ b/include/internal/quic_rcidm.h
@@ -1,22 +1,22 @@
 /*
-* Copyright 2023-2024 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2023-2024 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_RCIDM_H
-# define OSSL_INTERNAL_QUIC_RCIDM_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_RCIDM_H
+#pragma once
 
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/quic_types.h"
-# include "internal/quic_wire.h"
+#include "internal/e_os.h"
+#include "internal/time.h"
+#include "internal/quic_types.h"
+#include "internal/quic_wire.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Remote Connection ID Manager
@@ -65,7 +65,7 @@ void ossl_quic_rcidm_free(QUIC_RCIDM *rcidm);
  * must be enrolled using this function. May only be called once.
  */
 int ossl_quic_rcidm_add_from_initial(QUIC_RCIDM *rcidm,
-                                     const QUIC_CONN_ID *rcid);
+    const QUIC_CONN_ID *rcid);
 
 /*
  * To be called by a client when a server responds to the first Initial packet
@@ -78,7 +78,7 @@ int ossl_quic_rcidm_add_from_initial(QUIC_RCIDM *rcidm,
  * Not for server use.
  */
 int ossl_quic_rcidm_add_from_server_retry(QUIC_RCIDM *rcidm,
-                                          const QUIC_CONN_ID *retry_odcid);
+    const QUIC_CONN_ID *retry_odcid);
 
 /*
  * Processes an incoming NEW_CONN_ID frame, recording the new CID as a potential
@@ -87,7 +87,7 @@ int ossl_quic_rcidm_add_from_server_retry(QUIC_RCIDM *rcidm,
  * is responsible for handling it separately.
  */
 int ossl_quic_rcidm_add_from_ncid(QUIC_RCIDM *rcidm,
-                                  const OSSL_QUIC_FRAME_NEW_CONN_ID *ncid);
+    const OSSL_QUIC_FRAME_NEW_CONN_ID *ncid);
 
 /*
  * Other Events
@@ -157,7 +157,7 @@ int ossl_quic_rcidm_peek_retire_seq_num(QUIC_RCIDM *rcid, uint64_t *seq_num);
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_rcidm_get_preferred_tx_dcid(QUIC_RCIDM *rcidm,
-                                          QUIC_CONN_ID *tx_dcid);
+    QUIC_CONN_ID *tx_dcid);
 
 /*
  * Returns 1 if the value output by ossl_quic_rcidm_get_preferred_tx_dcid() has
@@ -165,7 +165,7 @@ int ossl_quic_rcidm_get_preferred_tx_dcid(QUIC_RCIDM *rcidm,
  * clears the changed flag. Returns the old value of the changed flag.
  */
 int ossl_quic_rcidm_get_preferred_tx_dcid_changed(QUIC_RCIDM *rcidm,
-                                                  int clear);
+    int clear);
 
 /*
  * Returns the number of active numbered RCIDs we have. Note that this includes
@@ -180,6 +180,6 @@ size_t ossl_quic_rcidm_get_num_active(const QUIC_RCIDM *rcidm);
  */
 size_t ossl_quic_rcidm_get_num_retiring(const QUIC_RCIDM *rcidm);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_reactor.h b/include/internal/quic_reactor.h
index e47ce52e6f31..dffc37d7549e 100644
--- a/include/internal/quic_reactor.h
+++ b/include/internal/quic_reactor.h
@@ -7,16 +7,16 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_QUIC_REACTOR_H
-# define OSSL_QUIC_REACTOR_H
+#define OSSL_QUIC_REACTOR_H
 
-# include "internal/time.h"
-# include "internal/sockets.h"
-# include "internal/quic_predef.h"
-# include "internal/thread_arch.h"
-# include "internal/rio_notifier.h"
-# include <openssl/bio.h>
+#include "internal/time.h"
+#include "internal/sockets.h"
+#include "internal/quic_predef.h"
+#include "internal/thread_arch.h"
+#include "internal/rio_notifier.h"
+#include <openssl/bio.h>
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * Core I/O Reactor Framework
@@ -71,20 +71,20 @@
  * the reactor interface.
  */
 struct quic_tick_result_st {
-    OSSL_TIME   tick_deadline;
-    char        net_read_desired;
-    char        net_write_desired;
-    char        notify_other_threads;
+    OSSL_TIME tick_deadline;
+    char net_read_desired;
+    char net_write_desired;
+    char notify_other_threads;
 };
 
 static ossl_inline ossl_unused void
 ossl_quic_tick_result_merge_into(QUIC_TICK_RESULT *r,
-                                 const QUIC_TICK_RESULT *src)
+    const QUIC_TICK_RESULT *src)
 {
-    r->net_read_desired     = r->net_read_desired  || src->net_read_desired;
-    r->net_write_desired    = r->net_write_desired || src->net_write_desired;
+    r->net_read_desired = r->net_read_desired || src->net_read_desired;
+    r->net_write_desired = r->net_write_desired || src->net_write_desired;
     r->notify_other_threads = r->notify_other_threads || src->notify_other_threads;
-    r->tick_deadline        = ossl_time_min(r->tick_deadline, src->tick_deadline);
+    r->tick_deadline = ossl_time_min(r->tick_deadline, src->tick_deadline);
 }
 
 struct quic_reactor_st {
@@ -124,8 +124,8 @@ struct quic_reactor_st {
      * These are true if we would like to know when we can read or write from
      * the network respectively.
      */
-    unsigned int net_read_desired   : 1;
-    unsigned int net_write_desired  : 1;
+    unsigned int net_read_desired : 1;
+    unsigned int net_write_desired : 1;
 
     /*
      * Are the read and write poll descriptors we are currently configured with
@@ -142,23 +142,23 @@ struct quic_reactor_st {
 };
 
 /* Create an OS notifier? */
-#define QUIC_REACTOR_FLAG_USE_NOTIFIER      (1U << 0)
+#define QUIC_REACTOR_FLAG_USE_NOTIFIER (1U << 0)
 
 int ossl_quic_reactor_init(QUIC_REACTOR *rtor,
-                           void (*tick_cb)(QUIC_TICK_RESULT *res, void *arg,
-                                           uint32_t flags),
-                           void *tick_cb_arg,
-                           CRYPTO_MUTEX *mutex,
-                           OSSL_TIME initial_tick_deadline,
-                           uint64_t flags);
+    void (*tick_cb)(QUIC_TICK_RESULT *res, void *arg,
+        uint32_t flags),
+    void *tick_cb_arg,
+    CRYPTO_MUTEX *mutex,
+    OSSL_TIME initial_tick_deadline,
+    uint64_t flags);
 
 void ossl_quic_reactor_cleanup(QUIC_REACTOR *rtor);
 
 void ossl_quic_reactor_set_poll_r(QUIC_REACTOR *rtor,
-                                  const BIO_POLL_DESCRIPTOR *r);
+    const BIO_POLL_DESCRIPTOR *r);
 
 void ossl_quic_reactor_set_poll_w(QUIC_REACTOR *rtor,
-                                  const BIO_POLL_DESCRIPTOR *w);
+    const BIO_POLL_DESCRIPTOR *w);
 
 const BIO_POLL_DESCRIPTOR *ossl_quic_reactor_get_poll_r(const QUIC_REACTOR *rtor);
 const BIO_POLL_DESCRIPTOR *ossl_quic_reactor_get_poll_w(const QUIC_REACTOR *rtor);
@@ -167,7 +167,7 @@ int ossl_quic_reactor_can_poll_r(const QUIC_REACTOR *rtor);
 int ossl_quic_reactor_can_poll_w(const QUIC_REACTOR *rtor);
 
 int ossl_quic_reactor_can_support_poll_descriptor(const QUIC_REACTOR *rtor,
-                                                  const BIO_POLL_DESCRIPTOR *d);
+    const BIO_POLL_DESCRIPTOR *d);
 
 int ossl_quic_reactor_net_read_desired(QUIC_REACTOR *rtor);
 int ossl_quic_reactor_net_write_desired(QUIC_REACTOR *rtor);
@@ -182,7 +182,7 @@ OSSL_TIME ossl_quic_reactor_get_tick_deadline(QUIC_REACTOR *rtor);
  * If the CHANNEL_ONLY flag is set, this indicates that we should only
  * touch state which is synchronised by the channel mutex.
  */
-#define QUIC_REACTOR_TICK_FLAG_CHANNEL_ONLY  (1U << 0)
+#define QUIC_REACTOR_TICK_FLAG_CHANNEL_ONLY (1U << 0)
 
 int ossl_quic_reactor_tick(QUIC_REACTOR *rtor, uint32_t flags);
 
@@ -235,11 +235,11 @@ RIO_NOTIFIER *ossl_quic_reactor_get0_notifier(QUIC_REACTOR *rtor);
  * Invariant:      The current thread does not have an outstanding
  *                   ossl_quic_reactor_enter_blocking_section() call (unchecked)
  */
-#define SKIP_FIRST_TICK     (1U << 0)
+#define SKIP_FIRST_TICK (1U << 0)
 
 int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor,
-                                       int (*pred)(void *arg), void *pred_arg,
-                                       uint32_t flags);
+    int (*pred)(void *arg), void *pred_arg,
+    uint32_t flags);
 
 /*
  * ossl_quic_reactor_(enter/leave)_blocking_section
@@ -279,6 +279,6 @@ int ossl_quic_reactor_block_until_pred(QUIC_REACTOR *rtor,
 void ossl_quic_reactor_enter_blocking_section(QUIC_REACTOR *rtor);
 void ossl_quic_reactor_leave_blocking_section(QUIC_REACTOR *rtor);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_reactor_wait_ctx.h b/include/internal/quic_reactor_wait_ctx.h
index 12e21cb518b7..8adc94d161ab 100644
--- a/include/internal/quic_reactor_wait_ctx.h
+++ b/include/internal/quic_reactor_wait_ctx.h
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_QUIC_REACTOR_WAIT_CTX_H
-# define OSSL_QUIC_REACTOR_WAIT_CTX_H
+#define OSSL_QUIC_REACTOR_WAIT_CTX_H
 
-# include "internal/quic_predef.h"
-# include "internal/quic_reactor.h"
-# include "internal/list.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_reactor.h"
+#include "internal/list.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC_REACTOR_WAIT_CTX
@@ -86,7 +86,8 @@ typedef struct quic_reactor_wait_slot_st QUIC_REACTOR_WAIT_SLOT;
 DECLARE_LIST_OF(quic_reactor_wait_slot, QUIC_REACTOR_WAIT_SLOT);
 
 struct quic_reactor_wait_ctx_st {
-    OSSL_LIST(quic_reactor_wait_slot) slots;
+    OSSL_LIST(quic_reactor_wait_slot)
+    slots;
 };
 
 /* Initialises a wait context. */
@@ -94,11 +95,11 @@ void ossl_quic_reactor_wait_ctx_init(QUIC_REACTOR_WAIT_CTX *ctx);
 
 /* Uprefs a given reactor. */
 int ossl_quic_reactor_wait_ctx_enter(QUIC_REACTOR_WAIT_CTX *ctx,
-                                     QUIC_REACTOR *rtor);
+    QUIC_REACTOR *rtor);
 
 /* Downrefs a given reactor. */
 void ossl_quic_reactor_wait_ctx_leave(QUIC_REACTOR_WAIT_CTX *ctx,
-                                      QUIC_REACTOR *rtor);
+    QUIC_REACTOR *rtor);
 
 /*
  * Destroys a wait context. Must be called after calling init().
@@ -109,6 +110,6 @@ void ossl_quic_reactor_wait_ctx_leave(QUIC_REACTOR_WAIT_CTX *ctx,
  */
 void ossl_quic_reactor_wait_ctx_cleanup(QUIC_REACTOR_WAIT_CTX *ctx);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_record_rx.h b/include/internal/quic_record_rx.h
index 24143f91f2f3..287837b2a561 100644
--- a/include/internal/quic_record_rx.h
+++ b/include/internal/quic_record_rx.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OSSL_QUIC_RECORD_RX_H
-# define OSSL_QUIC_RECORD_RX_H
+#define OSSL_QUIC_RECORD_RX_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_wire_pkt.h"
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
-# include "internal/quic_record_util.h"
-# include "internal/quic_demux.h"
+#include <openssl/ssl.h>
+#include "internal/quic_wire_pkt.h"
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_record_util.h"
+#include "internal/quic_demux.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Record Layer - RX
@@ -25,26 +25,26 @@
  */
 
 typedef struct ossl_qrx_args_st {
-    OSSL_LIB_CTX   *libctx;
-    const char     *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /* Demux which owns the URXEs passed to us. */
-    QUIC_DEMUX     *demux;
+    QUIC_DEMUX *demux;
 
     /* Length of connection IDs used in short-header packets in bytes. */
-    size_t          short_conn_id_len;
+    size_t short_conn_id_len;
 
     /*
      * Maximum number of deferred datagrams buffered at any one time.
      * Suggested value: 32.
      */
-    size_t          max_deferred;
+    size_t max_deferred;
 
     /* Initial reference PN used for RX. */
-    QUIC_PN         init_largest_pn[QUIC_PN_SPACE_NUM];
+    QUIC_PN init_largest_pn[QUIC_PN_SPACE_NUM];
 
     /* Initial key phase. For debugging use only; always 0 in real use. */
-    unsigned char   init_key_phase_bit;
+    unsigned char init_key_phase_bit;
 } OSSL_QRX_ARGS;
 
 /* Instantiates a new QRX. */
@@ -62,9 +62,9 @@ void ossl_qrx_free(OSSL_QRX *qrx);
 
 /* Setters for the msg_callback and msg_callback_arg */
 void ossl_qrx_set_msg_callback(OSSL_QRX *qrx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_ssl);
+    SSL *msg_callback_ssl);
 void ossl_qrx_set_msg_callback_arg(OSSL_QRX *qrx,
-                                   void *msg_callback_arg);
+    void *msg_callback_arg);
 
 /*
  * Get the short header connection id len from this qrx
@@ -160,12 +160,12 @@ size_t ossl_qrx_get_short_hdr_conn_id_len(OSSL_QRX *qrx);
  *
  * Returns 1 on success or 0 on failure.
  */
-int ossl_qrx_provide_secret(OSSL_QRX              *qrx,
-                            uint32_t               enc_level,
-                            uint32_t               suite_id,
-                            EVP_MD                *md,
-                            const unsigned char   *secret,
-                            size_t                 secret_len);
+int ossl_qrx_provide_secret(OSSL_QRX *qrx,
+    uint32_t enc_level,
+    uint32_t suite_id,
+    EVP_MD *md,
+    const unsigned char *secret,
+    size_t secret_len);
 
 /*
  * Utility function to update the pn space from a src to a dst qrx.
@@ -200,20 +200,20 @@ struct ossl_qrx_pkt_st {
      * data and len fields point to the decrypted QUIC payload (i.e., to a
      * sequence of zero or more (potentially malformed) frames to be decoded).
      */
-    QUIC_PKT_HDR       *hdr;
+    QUIC_PKT_HDR *hdr;
 
     /*
      * Address the packet was received from. If this is not available for this
      * packet, this field is NULL (but this can only occur for manually injected
      * packets).
      */
-    const BIO_ADDR     *peer;
+    const BIO_ADDR *peer;
 
     /*
      * Local address the packet was sent to. If this is not available for this
      * packet, this field is NULL.
      */
-    const BIO_ADDR     *local;
+    const BIO_ADDR *local;
 
     /*
      * This is the length of the datagram which contained this packet. Note that
@@ -221,31 +221,31 @@ struct ossl_qrx_pkt_st {
      * for this is so that the user can enforce minimum datagram sizes (e.g. for
      * datagrams containing INITIAL packets), as required by RFC 9000.
      */
-    size_t              datagram_len;
+    size_t datagram_len;
 
     /* The PN which was decoded for the packet, if the packet has a PN field. */
-    QUIC_PN             pn;
+    QUIC_PN pn;
 
     /*
      * Time the packet was received, or ossl_time_zero() if the demuxer is not
      * using a now() function.
      */
-    OSSL_TIME           time;
+    OSSL_TIME time;
 
     /* The QRX which was used to receive the packet. */
-    OSSL_QRX            *qrx;
+    OSSL_QRX *qrx;
 
     /*
      * The key epoch the packet was received with. Always 0 for non-1-RTT
      * packets.
      */
-    uint64_t            key_epoch;
+    uint64_t key_epoch;
 
     /*
      * This monotonically increases with each datagram received.
      * It is for diagnostic use only.
      */
-    uint64_t            datagram_id;
+    uint64_t datagram_id;
 };
 
 /*
@@ -322,12 +322,12 @@ uint64_t ossl_qrx_get_bytes_received(OSSL_QRX *qrx, int clear);
  * The callback is optional and can be unset by passing NULL for cb.
  * cb_arg is an opaque value passed to cb.
  */
-typedef int (ossl_qrx_late_validation_cb)(QUIC_PN pn, int pn_space,
-                                          void *arg);
+typedef int(ossl_qrx_late_validation_cb)(QUIC_PN pn, int pn_space,
+    void *arg);
 
 int ossl_qrx_set_late_validation_cb(OSSL_QRX *qrx,
-                                    ossl_qrx_late_validation_cb *cb,
-                                    void *cb_arg);
+    ossl_qrx_late_validation_cb *cb,
+    void *cb_arg);
 
 /*
  * Forcibly injects a URXE which has been issued by the DEMUX into the QRX for
@@ -339,7 +339,7 @@ int ossl_qrx_set_late_validation_cb(OSSL_QRX *qrx,
 void ossl_qrx_inject_urxe(OSSL_QRX *qrx, QUIC_URXE *e);
 void ossl_qrx_inject_pkt(OSSL_QRX *qrx, OSSL_QRX_PKT *pkt);
 int ossl_qrx_validate_initial_packet(OSSL_QRX *qrx, QUIC_URXE *urxe,
-                                     const QUIC_CONN_ID *dcid);
+    const QUIC_CONN_ID *dcid);
 
 /*
  * Decryption of 1-RTT packets must be explicitly enabled by calling this
@@ -514,11 +514,11 @@ uint64_t ossl_qrx_get_key_epoch(OSSL_QRX *qrx);
  * cb_arg is an opaque value passed to cb. pn is the PN of the packet.
  * Since key update is only supported for 1-RTT packets, the PN is always
  * in the Application Data PN space.
-*/
-typedef void (ossl_qrx_key_update_cb)(QUIC_PN pn, void *arg);
+ */
+typedef void(ossl_qrx_key_update_cb)(QUIC_PN pn, void *arg);
 
 int ossl_qrx_set_key_update_cb(OSSL_QRX *qrx,
-                               ossl_qrx_key_update_cb *cb, void *cb_arg);
+    ossl_qrx_key_update_cb *cb, void *cb_arg);
 
 /*
  * Relates to the 1-RTT encryption level. The caller should call this after the
@@ -540,7 +540,6 @@ int ossl_qrx_set_key_update_cb(OSSL_QRX *qrx,
  */
 int ossl_qrx_key_update_timeout(OSSL_QRX *qrx, int normal);
 
-
 /*
  * Key Expiration
  * ==============
@@ -565,8 +564,8 @@ uint64_t ossl_qrx_get_cur_forged_pkt_count(OSSL_QRX *qrx);
  * permit to be verified using this QRX instance.
  */
 uint64_t ossl_qrx_get_max_forged_pkt_count(OSSL_QRX *qrx,
-                                           uint32_t enc_level);
+    uint32_t enc_level);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_record_tx.h b/include/internal/quic_record_tx.h
index e84523f895ca..b2be046f8c61 100644
--- a/include/internal/quic_record_tx.h
+++ b/include/internal/quic_record_tx.h
@@ -8,50 +8,50 @@
  */
 
 #ifndef OSSL_QUIC_RECORD_TX_H
-# define OSSL_QUIC_RECORD_TX_H
+#define OSSL_QUIC_RECORD_TX_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_wire_pkt.h"
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
-# include "internal/quic_record_util.h"
-# include "internal/qlog.h"
+#include <openssl/ssl.h>
+#include "internal/quic_wire_pkt.h"
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_record_util.h"
+#include "internal/qlog.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Record Layer - TX
  * ======================
  */
 typedef struct ossl_qtx_iovec_st {
-    const unsigned char    *buf;
-    size_t                  buf_len;
+    const unsigned char *buf;
+    size_t buf_len;
 } OSSL_QTX_IOVEC;
 
 typedef struct ossl_qtx_st OSSL_QTX;
 
 typedef int (*ossl_mutate_packet_cb)(const QUIC_PKT_HDR *hdrin,
-                                     const OSSL_QTX_IOVEC *iovecin, size_t numin,
-                                     QUIC_PKT_HDR **hdrout,
-                                     const OSSL_QTX_IOVEC **iovecout,
-                                     size_t *numout,
-                                     void *arg);
+    const OSSL_QTX_IOVEC *iovecin, size_t numin,
+    QUIC_PKT_HDR **hdrout,
+    const OSSL_QTX_IOVEC **iovecout,
+    size_t *numout,
+    void *arg);
 
 typedef void (*ossl_finish_mutate_cb)(void *arg);
 
 typedef struct ossl_qtx_args_st {
-    OSSL_LIB_CTX   *libctx;
-    const char     *propq;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
 
     /* BIO to transmit to. */
-    BIO            *bio;
+    BIO *bio;
 
     /* Maximum datagram payload length (MDPL) for TX purposes. */
-    size_t          mdpl;
+    size_t mdpl;
 
     /* Callback returning QLOG instance to use, or NULL. */
-    QLOG           *(*get_qlog_cb)(void *arg);
-    void           *get_qlog_cb_arg;
+    QLOG *(*get_qlog_cb)(void *arg);
+    void *get_qlog_cb_arg;
 } OSSL_QTX_ARGS;
 
 /* Instantiates a new QTX. */
@@ -62,16 +62,16 @@ void ossl_qtx_free(OSSL_QTX *qtx);
 
 /* Set mutator callbacks for test framework support */
 void ossl_qtx_set_mutator(OSSL_QTX *qtx, ossl_mutate_packet_cb mutatecb,
-                          ossl_finish_mutate_cb finishmutatecb, void *mutatearg);
+    ossl_finish_mutate_cb finishmutatecb, void *mutatearg);
 
 /* Setters for the msg_callback and the msg_callback_arg */
 void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_ssl);
+    SSL *msg_callback_ssl);
 void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg);
 
 /* Change QLOG instance retrieval callback in use after instantiation. */
 void ossl_qtx_set_qlog_cb(OSSL_QTX *qtx, QLOG *(*get_qlog_cb)(void *arg),
-                          void *get_qlog_cb_arg);
+    void *get_qlog_cb_arg);
 
 /*
  * Secret Management
@@ -111,12 +111,12 @@ void ossl_qtx_set_qlog_cb(OSSL_QTX *qtx, QLOG *(*get_qlog_cb)(void *arg),
  *
  * Returns 1 on success or 0 on failure.
  */
-int ossl_qtx_provide_secret(OSSL_QTX              *qtx,
-                            uint32_t               enc_level,
-                            uint32_t               suite_id,
-                            EVP_MD                *md,
-                            const unsigned char   *secret,
-                            size_t                 secret_len);
+int ossl_qtx_provide_secret(OSSL_QTX *qtx,
+    uint32_t enc_level,
+    uint32_t suite_id,
+    EVP_MD *md,
+    const unsigned char *secret,
+    size_t secret_len);
 
 /*
  * Informs the QTX that it can now discard key material for a given EL. The QTX
@@ -137,8 +137,8 @@ int ossl_qtx_is_enc_level_provisioned(OSSL_QTX *qtx, uint32_t enc_level);
  * small. The result is written to *plaintext_len.
  */
 int ossl_qtx_calculate_plaintext_payload_len(OSSL_QTX *qtx, uint32_t enc_level,
-                                             size_t ciphertext_len,
-                                             size_t *plaintext_len);
+    size_t ciphertext_len,
+    size_t *plaintext_len);
 
 /*
  * Given the value plaintext_len represented a plaintext packet payload length
@@ -147,12 +147,11 @@ int ossl_qtx_calculate_plaintext_payload_len(OSSL_QTX *qtx, uint32_t enc_level,
  * provisioned. The result is written to *ciphertext_len.
  */
 int ossl_qtx_calculate_ciphertext_payload_len(OSSL_QTX *qtx, uint32_t enc_level,
-                                              size_t plaintext_len,
-                                              size_t *ciphertext_len);
+    size_t plaintext_len,
+    size_t *ciphertext_len);
 
 uint32_t ossl_qrl_get_suite_cipher_tag_len(uint32_t suite_id);
 
-
 /*
  * Packet Transmission
  * -------------------
@@ -160,32 +159,32 @@ uint32_t ossl_qrl_get_suite_cipher_tag_len(uint32_t suite_id);
 
 struct ossl_qtx_pkt_st {
     /* Logical packet header to be serialized. */
-    QUIC_PKT_HDR               *hdr;
+    QUIC_PKT_HDR *hdr;
 
     /*
      * iovecs expressing the logical packet payload buffer. Zero-length entries
      * are permitted.
      */
-    const OSSL_QTX_IOVEC       *iovec;
-    size_t                      num_iovec;
+    const OSSL_QTX_IOVEC *iovec;
+    size_t num_iovec;
 
     /* Destination address. Will be passed through to the BIO if non-NULL. */
-    const BIO_ADDR             *peer;
+    const BIO_ADDR *peer;
 
     /*
      * Local address (optional). Specify as non-NULL only if TX BIO
      * has local address support enabled.
      */
-    const BIO_ADDR             *local;
+    const BIO_ADDR *local;
 
     /*
      * Logical PN. Used for encryption. This will automatically be encoded to
      * hdr->pn, which need not be initialized.
      */
-    QUIC_PN                     pn;
+    QUIC_PN pn;
 
     /* Packet flags. Zero or more OSSL_QTX_PKT_FLAG_* values. */
-    uint32_t                    flags;
+    uint32_t flags;
 };
 
 /*
@@ -201,7 +200,7 @@ struct ossl_qtx_pkt_st {
  * COALESCE after having passed it to this function but without writing another
  * packet, it should call ossl_qtx_flush_pkt().
  */
-#define OSSL_QTX_PKT_FLAG_COALESCE       (1U << 0)
+#define OSSL_QTX_PKT_FLAG_COALESCE (1U << 0)
 
 /*
  * Writes a packet.
@@ -265,9 +264,9 @@ void ossl_qtx_finish_dgram(OSSL_QTX *qtx);
  *      or the underlying network write BIO indicated a non-transient
  *      error.
  */
-#define QTX_FLUSH_NET_RES_OK                1
-#define QTX_FLUSH_NET_RES_TRANSIENT_FAIL    (-1)
-#define QTX_FLUSH_NET_RES_PERMANENT_FAIL    (-2)
+#define QTX_FLUSH_NET_RES_OK 1
+#define QTX_FLUSH_NET_RES_TRANSIENT_FAIL (-1)
+#define QTX_FLUSH_NET_RES_PERMANENT_FAIL (-2)
 
 int ossl_qtx_flush_net(OSSL_QTX *qtx);
 
@@ -313,7 +312,6 @@ int ossl_qtx_set_mdpl(OSSL_QTX *qtx, size_t mdpl);
 /* Retrieves the current MDPL. */
 size_t ossl_qtx_get_mdpl(OSSL_QTX *qtx);
 
-
 /*
  * Key Update
  * ----------
@@ -344,7 +342,6 @@ size_t ossl_qtx_get_mdpl(OSSL_QTX *qtx);
  */
 int ossl_qtx_trigger_key_update(OSSL_QTX *qtx);
 
-
 /*
  * Key Expiration
  * --------------
@@ -388,6 +385,6 @@ uint64_t ossl_qtx_get_max_epoch_pkt_count(OSSL_QTX *qtx, uint32_t enc_level);
  */
 uint64_t ossl_qtx_get_key_epoch(OSSL_QTX *qtx);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_record_util.h b/include/internal/quic_record_util.h
index 97e630d924e0..61ab92546234 100644
--- a/include/internal/quic_record_util.h
+++ b/include/internal/quic_record_util.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OSSL_QUIC_RECORD_UTIL_H
-# define OSSL_QUIC_RECORD_UTIL_H
+#define OSSL_QUIC_RECORD_UTIL_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 struct ossl_qrx_st;
 struct ossl_qtx_st;
@@ -25,11 +25,11 @@ struct ossl_qtx_st;
 
 /* HKDF-Extract(salt, IKM) (RFC 5869) */
 int ossl_quic_hkdf_extract(OSSL_LIB_CTX *libctx,
-                           const char *propq,
-                           const EVP_MD *md,
-                           const unsigned char *salt, size_t salt_len,
-                           const unsigned char *ikm, size_t ikm_len,
-                           unsigned char *out, size_t out_len);
+    const char *propq,
+    const EVP_MD *md,
+    const unsigned char *salt, size_t salt_len,
+    const unsigned char *ikm, size_t ikm_len,
+    unsigned char *out, size_t out_len);
 
 /*
  * A QUIC client sends its first INITIAL packet with a random DCID, which
@@ -59,11 +59,11 @@ int ossl_quic_hkdf_extract(OSSL_LIB_CTX *libctx,
  * Returns 1 on success or 0 on error.
  */
 int ossl_quic_provide_initial_secret(OSSL_LIB_CTX *libctx,
-                                     const char *propq,
-                                     const QUIC_CONN_ID *dst_conn_id,
-                                     int is_server,
-                                     struct ossl_qrx_st *qrx,
-                                     struct ossl_qtx_st *qtx);
+    const char *propq,
+    const QUIC_CONN_ID *dst_conn_id,
+    int is_server,
+    struct ossl_qrx_st *qrx,
+    struct ossl_qtx_st *qtx);
 
 /*
  * QUIC Record Layer Ciphersuite Info
@@ -71,9 +71,9 @@ int ossl_quic_provide_initial_secret(OSSL_LIB_CTX *libctx,
  */
 
 /* Available QUIC Record Layer (QRL) ciphersuites. */
-# define QRL_SUITE_AES128GCM            1 /* SHA256 */
-# define QRL_SUITE_AES256GCM            2 /* SHA384 */
-# define QRL_SUITE_CHACHA20POLY1305     3 /* SHA256 */
+#define QRL_SUITE_AES128GCM 1 /* SHA256 */
+#define QRL_SUITE_AES256GCM 2 /* SHA384 */
+#define QRL_SUITE_CHACHA20POLY1305 3 /* SHA256 */
 
 /* Returns cipher name in bytes or NULL if suite ID is invalid. */
 const char *ossl_qrl_get_suite_cipher_name(uint32_t suite_id);
@@ -111,6 +111,6 @@ uint64_t ossl_qrl_get_suite_max_pkt(uint32_t suite_id);
  */
 uint64_t ossl_qrl_get_suite_max_forged_pkt(uint32_t suite_id);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_rx_depack.h b/include/internal/quic_rx_depack.h
index c90964a7c16c..648341e9c8f0 100644
--- a/include/internal/quic_rx_depack.h
+++ b/include/internal/quic_rx_depack.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_QUIC_RX_DEPACK_H
-# define OSSL_QUIC_RX_DEPACK_H
+#define OSSL_QUIC_RX_DEPACK_H
 
-# include "internal/quic_channel.h"
+#include "internal/quic_channel.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 int ossl_quic_handle_frames(QUIC_CHANNEL *qc, OSSL_QRX_PKT *qpacket);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_sf_list.h b/include/internal/quic_sf_list.h
index 8ed1dcb137e3..1a22cc3f387a 100644
--- a/include/internal/quic_sf_list.h
+++ b/include/internal/quic_sf_list.h
@@ -8,7 +8,7 @@
  */
 
 #ifndef OSSL_QUIC_SF_LIST_H
-# define OSSL_QUIC_SF_LIST_H
+#define OSSL_QUIC_SF_LIST_H
 
 #include "internal/common.h"
 #include "internal/uint_set.h"
@@ -35,12 +35,12 @@
  *            able to mark an empty frame.
  * Invariant: The offset never points further than into the first frame.
  */
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 typedef struct stream_frame_st STREAM_FRAME;
 
 typedef struct sframe_list_st {
-    STREAM_FRAME  *head, *tail;
+    STREAM_FRAME *head, *tail;
     /* Is the tail frame final. */
     unsigned int fin;
     /* Number of stream frames in the list. */
@@ -75,8 +75,8 @@ void ossl_sframe_list_destroy(SFRAME_LIST *fl);
  * check it on its own too).
  */
 int ossl_sframe_list_insert(SFRAME_LIST *fl, UINT_RANGE *range,
-                            OSSL_QRX_PKT *pkt,
-                            const unsigned char *data, int fin);
+    OSSL_QRX_PKT *pkt,
+    const unsigned char *data, int fin);
 
 /*
  * Iterator to peek at the contiguous frames at the beginning
@@ -91,8 +91,8 @@ int ossl_sframe_list_insert(SFRAME_LIST *fl, UINT_RANGE *range,
  * case *fin is set, if the end of the stream is reached.
  */
 int ossl_sframe_list_peek(const SFRAME_LIST *fl, void **iter,
-                          UINT_RANGE *range, const unsigned char **data,
-                          int *fin);
+    UINT_RANGE *range, const unsigned char **data,
+    int *fin);
 
 /*
  * Drop all frames up to the offset limit.
@@ -114,8 +114,8 @@ int ossl_sframe_list_drop_frames(SFRAME_LIST *fl, uint64_t limit);
  * frame is already locked.
  */
 int ossl_sframe_list_lock_head(SFRAME_LIST *fl, UINT_RANGE *range,
-                               const unsigned char **data,
-                               int *fin);
+    const unsigned char **data,
+    int *fin);
 
 /*
  * Just returns whether the head frame is locked by previous
@@ -130,10 +130,10 @@ int ossl_sframe_list_is_head_locked(SFRAME_LIST *fl);
  * It should return 1 on success or 0 if there is not enough
  * space available in the side storage.
  */
-typedef int (sframe_list_write_at_cb)(uint64_t logical_offset,
-                                      const unsigned char *buf,
-                                      size_t buf_len,
-                                      void *cb_arg);
+typedef int(sframe_list_write_at_cb)(uint64_t logical_offset,
+    const unsigned char *buf,
+    size_t buf_len,
+    void *cb_arg);
 
 /*
  * Move the frame data in all the stream frames in the list fl
@@ -144,8 +144,8 @@ typedef int (sframe_list_write_at_cb)(uint64_t logical_offset,
  * frames and returns 0.
  */
 int ossl_sframe_list_move_data(SFRAME_LIST *fl,
-                               sframe_list_write_at_cb *write_at_cb,
-                               void *cb_arg);
-# endif
+    sframe_list_write_at_cb *write_at_cb,
+    void *cb_arg);
+#endif
 
 #endif
diff --git a/include/internal/quic_srt_gen.h b/include/internal/quic_srt_gen.h
index a25e71aa81ed..69c9df09e71e 100644
--- a/include/internal/quic_srt_gen.h
+++ b/include/internal/quic_srt_gen.h
@@ -1,22 +1,22 @@
 /*
-* Copyright 2023 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2023 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_SRT_GEN_H
-# define OSSL_INTERNAL_QUIC_SRT_GEN_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_SRT_GEN_H
+#pragma once
 
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/quic_types.h"
-# include "internal/quic_wire.h"
+#include "internal/e_os.h"
+#include "internal/time.h"
+#include "internal/quic_types.h"
+#include "internal/quic_wire.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Stateless Reset Token Generator
@@ -40,7 +40,7 @@ typedef struct quic_srt_gen_st QUIC_SRT_GEN;
  * in any other context.
  */
 QUIC_SRT_GEN *ossl_quic_srt_gen_new(OSSL_LIB_CTX *libctx, const char *propq,
-                                    const unsigned char *key, size_t key_len);
+    const unsigned char *key, size_t key_len);
 
 /* Free the stateless reset token generator. No-op if srt_gen is NULL. */
 void ossl_quic_srt_gen_free(QUIC_SRT_GEN *srt_gen);
@@ -50,8 +50,8 @@ void ossl_quic_srt_gen_free(QUIC_SRT_GEN *srt_gen);
  * failure.
  */
 int ossl_quic_srt_gen_calculate_token(QUIC_SRT_GEN *srt_gen,
-                                      const QUIC_CONN_ID *dcid,
-                                      QUIC_STATELESS_RESET_TOKEN *token);
+    const QUIC_CONN_ID *dcid,
+    QUIC_STATELESS_RESET_TOKEN *token);
 
-# endif
+#endif
 #endif
diff --git a/include/internal/quic_srtm.h b/include/internal/quic_srtm.h
index d60c285e2295..1a8f55da5df2 100644
--- a/include/internal/quic_srtm.h
+++ b/include/internal/quic_srtm.h
@@ -1,23 +1,23 @@
 /*
-* Copyright 2023 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2023 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_SRTM_H
-# define OSSL_INTERNAL_QUIC_SRTM_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_SRTM_H
+#pragma once
 
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/quic_types.h"
-# include "internal/quic_wire.h"
-# include "internal/quic_predef.h"
+#include "internal/e_os.h"
+#include "internal/time.h"
+#include "internal/quic_types.h"
+#include "internal/quic_wire.h"
+#include "internal/quic_predef.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Stateless Reset Token Manager
@@ -67,7 +67,7 @@ void ossl_quic_srtm_free(QUIC_SRTM *srtm);
  * copied. Returns 1 on success or 0 on failure.
  */
 int ossl_quic_srtm_add(QUIC_SRTM *srtm, void *opaque, uint64_t seq_num,
-                       const QUIC_STATELESS_RESET_TOKEN *token);
+    const QUIC_STATELESS_RESET_TOKEN *token);
 
 /*
  * Removes an entry by identifying it via its (opaque, seq_num) tuple.
@@ -97,13 +97,13 @@ int ossl_quic_srtm_cull(QUIC_SRTM *strm, void *opaque);
  * Returns 1 if an entry was found and 0 otherwise.
  */
 int ossl_quic_srtm_lookup(QUIC_SRTM *srtm,
-                          const QUIC_STATELESS_RESET_TOKEN *token,
-                          size_t idx,
-                          void **opaque, uint64_t *seq_num);
+    const QUIC_STATELESS_RESET_TOKEN *token,
+    size_t idx,
+    void **opaque, uint64_t *seq_num);
 
 /* Verify internal invariants and assert if they are not met. */
 void ossl_quic_srtm_check(const QUIC_SRTM *srtm);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h
index e7fd260ab600..f714d1047716 100644
--- a/include/internal/quic_ssl.h
+++ b/include/internal/quic_ssl.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_QUIC_SSL_H
-# define OSSL_QUIC_SSL_H
+#define OSSL_QUIC_SSL_H
 
-# include <openssl/ssl.h>
-# include <openssl/bio.h>
-# include "internal/refcount.h"
-# include "internal/quic_record_rx.h" /* OSSL_QRX */
-# include "internal/quic_ackm.h"      /* OSSL_ACKM */
-# include "internal/quic_channel.h"   /* QUIC_CHANNEL */
-# include "internal/quic_predef.h"
+#include <openssl/ssl.h>
+#include <openssl/bio.h>
+#include "internal/refcount.h"
+#include "internal/quic_record_rx.h" /* OSSL_QRX */
+#include "internal/quic_ackm.h" /* OSSL_ACKM */
+#include "internal/quic_channel.h" /* QUIC_CHANNEL */
+#include "internal/quic_predef.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 __owur SSL *ossl_quic_new(SSL_CTX *ctx);
 __owur SSL *ossl_quic_new_listener(SSL_CTX *ctx, uint64_t flags);
@@ -42,9 +42,9 @@ void ossl_quic_free_token_store(SSL_TOKEN_STORE *hdl);
 SSL_TOKEN_STORE *ossl_quic_get0_token_store(SSL_CTX *ctx);
 int ossl_quic_set1_token_store(SSL_CTX *ctx, SSL_TOKEN_STORE *hdl);
 int ossl_quic_set_peer_token(SSL_CTX *ctx, BIO_ADDR *peer,
-                             const uint8_t *token, size_t token_len);
+    const uint8_t *token, size_t token_len);
 int ossl_quic_get_peer_token(SSL_CTX *ctx, BIO_ADDR *peer,
-                             QUIC_TOKEN **token);
+    QUIC_TOKEN **token);
 void ossl_quic_free_peer_token(QUIC_TOKEN *token);
 
 __owur int ossl_quic_init(SSL *s);
@@ -57,12 +57,12 @@ __owur int ossl_quic_connect(SSL *s);
 __owur int ossl_quic_read(SSL *s, void *buf, size_t len, size_t *readbytes);
 __owur int ossl_quic_peek(SSL *s, void *buf, size_t len, size_t *readbytes);
 __owur int ossl_quic_write_flags(SSL *s, const void *buf, size_t len,
-                                 uint64_t flags, size_t *written);
+    uint64_t flags, size_t *written);
 __owur int ossl_quic_write(SSL *s, const void *buf, size_t len, size_t *written);
 __owur long ossl_quic_ctrl(SSL *s, int cmd, long larg, void *parg);
 __owur long ossl_quic_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
-__owur long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp) (void));
-__owur long ossl_quic_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void));
+__owur long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp)(void));
+__owur long ossl_quic_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void));
 __owur size_t ossl_quic_pending(const SSL *s);
 __owur int ossl_quic_key_update(SSL *s, int update_type);
 __owur int ossl_quic_get_key_update_type(const SSL *s);
@@ -78,7 +78,7 @@ int ossl_quic_set_accept_state(SSL *s, int raiseerrs);
 __owur int ossl_quic_has_pending(const SSL *s);
 __owur int ossl_quic_handle_events(SSL *s);
 __owur int ossl_quic_get_event_timeout(SSL *s, struct timeval *tv,
-                                       int *is_infinite);
+    int *is_infinite);
 OSSL_TIME ossl_quic_get_event_deadline(SSL *s);
 __owur int ossl_quic_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *d);
 __owur int ossl_quic_get_wpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *d);
@@ -89,15 +89,15 @@ __owur int ossl_quic_want(const SSL *s);
 __owur int ossl_quic_conn_get_blocking_mode(const SSL *s);
 __owur int ossl_quic_conn_set_blocking_mode(SSL *s, int blocking);
 __owur int ossl_quic_conn_shutdown(SSL *s, uint64_t flags,
-                                   const SSL_SHUTDOWN_EX_ARGS *args,
-                                   size_t args_len);
+    const SSL_SHUTDOWN_EX_ARGS *args,
+    size_t args_len);
 __owur int ossl_quic_conn_stream_conclude(SSL *s);
 void ossl_quic_conn_set0_net_rbio(SSL *s, BIO *net_wbio);
 void ossl_quic_conn_set0_net_wbio(SSL *s, BIO *net_wbio);
 BIO *ossl_quic_conn_get_net_rbio(const SSL *s);
 BIO *ossl_quic_conn_get_net_wbio(const SSL *s);
 __owur int ossl_quic_conn_set_initial_peer_addr(SSL *s,
-                                                const BIO_ADDR *peer_addr);
+    const BIO_ADDR *peer_addr);
 __owur SSL *ossl_quic_conn_stream_new(SSL *s, uint64_t flags);
 __owur SSL *ossl_quic_get0_connection(SSL *s);
 __owur SSL *ossl_quic_get0_listener(SSL *s);
@@ -110,30 +110,30 @@ __owur int ossl_quic_set_default_stream_mode(SSL *s, uint32_t mode);
 __owur SSL *ossl_quic_detach_stream(SSL *s);
 __owur int ossl_quic_attach_stream(SSL *conn, SSL *stream);
 __owur int ossl_quic_set_incoming_stream_policy(SSL *s, int policy,
-                                                uint64_t aec);
+    uint64_t aec);
 __owur SSL *ossl_quic_accept_stream(SSL *s, uint64_t flags);
 __owur size_t ossl_quic_get_accept_stream_queue_len(SSL *s);
 __owur int ossl_quic_get_value_uint(SSL *s, uint32_t class_, uint32_t id,
-                                    uint64_t *value);
+    uint64_t *value);
 __owur int ossl_quic_set_value_uint(SSL *s, uint32_t class_, uint32_t id,
-                                    uint64_t value);
+    uint64_t value);
 __owur SSL *ossl_quic_accept_connection(SSL *ssl, uint64_t flags);
 __owur size_t ossl_quic_get_accept_connection_queue_len(SSL *ssl);
 __owur int ossl_quic_listen(SSL *ssl);
 
 __owur int ossl_quic_stream_reset(SSL *ssl,
-                                  const SSL_STREAM_RESET_ARGS *args,
-                                  size_t args_len);
+    const SSL_STREAM_RESET_ARGS *args,
+    size_t args_len);
 
 __owur int ossl_quic_get_stream_read_state(SSL *ssl);
 __owur int ossl_quic_get_stream_write_state(SSL *ssl);
 __owur int ossl_quic_get_stream_read_error_code(SSL *ssl,
-                                                uint64_t *app_error_code);
+    uint64_t *app_error_code);
 __owur int ossl_quic_get_stream_write_error_code(SSL *ssl,
-                                                 uint64_t *app_error_code);
+    uint64_t *app_error_code);
 __owur int ossl_quic_get_conn_close_info(SSL *ssl,
-                                         SSL_CONN_CLOSE_INFO *info,
-                                         size_t info_len);
+    SSL_CONN_CLOSE_INFO *info,
+    size_t info_len);
 
 uint64_t ossl_quic_set_options(SSL *s, uint64_t opts);
 uint64_t ossl_quic_clear_options(SSL *s, uint64_t opts);
@@ -148,8 +148,8 @@ __owur int ossl_quic_set_write_buffer_size(SSL *s, size_t size);
  * connecting.
  */
 int ossl_quic_set_override_now_cb(SSL *s,
-                                  OSSL_TIME (*now_cb)(void *arg),
-                                  void *now_cb_arg);
+    OSSL_TIME (*now_cb)(void *arg),
+    void *now_cb_arg);
 
 /*
  * Condvar waiting in the assist thread doesn't support time faking as it relies
@@ -175,11 +175,11 @@ int ossl_quic_set_diag_title(SSL_CTX *ctx, const char *title);
 
 /* APIs used by the polling infrastructure */
 int ossl_quic_conn_poll_events(SSL *ssl, uint64_t events, int do_tick,
-                               uint64_t *revents);
+    uint64_t *revents);
 int ossl_quic_get_notifier_fd(SSL *ssl);
 void ossl_quic_enter_blocking_section(SSL *ssl, QUIC_REACTOR_WAIT_CTX *wctx);
 void ossl_quic_leave_blocking_section(SSL *ssl, QUIC_REACTOR_WAIT_CTX *wctx);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_statm.h b/include/internal/quic_statm.h
index 2fca69b0d181..e6a7ebfb8413 100644
--- a/include/internal/quic_statm.h
+++ b/include/internal/quic_statm.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_QUIC_STATS_H
-# define OSSL_QUIC_STATS_H
+#define OSSL_QUIC_STATS_H
 
-# include <openssl/ssl.h>
-# include "internal/time.h"
-# include "internal/quic_predef.h"
+#include <openssl/ssl.h>
+#include "internal/time.h"
+#include "internal/quic_predef.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 struct ossl_statm_st {
     OSSL_TIME smoothed_rtt, latest_rtt, min_rtt, rtt_variance;
-    char      have_first_sample;
+    char have_first_sample;
 };
 
 typedef struct ossl_rtt_info_st {
@@ -33,9 +33,9 @@ void ossl_statm_destroy(OSSL_STATM *statm);
 void ossl_statm_get_rtt_info(OSSL_STATM *statm, OSSL_RTT_INFO *rtt_info);
 
 void ossl_statm_update_rtt(OSSL_STATM *statm,
-                           OSSL_TIME ack_delay,
-                           OSSL_TIME override_latest_rtt);
+    OSSL_TIME ack_delay,
+    OSSL_TIME override_latest_rtt);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_stream.h b/include/internal/quic_stream.h
index d446dadc5047..824d4b896967 100644
--- a/include/internal/quic_stream.h
+++ b/include/internal/quic_stream.h
@@ -1,15 +1,15 @@
 /*
-* Copyright 2022-2023 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2022-2023 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_STREAM_H
-# define OSSL_INTERNAL_QUIC_STREAM_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_STREAM_H
+#pragma once
 
 #include "internal/e_os.h"
 #include "internal/time.h"
@@ -21,7 +21,7 @@
 #include "internal/quic_fc.h"
 #include "internal/quic_statm.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Send Stream
@@ -126,10 +126,10 @@ void ossl_quic_sstream_free(QUIC_SSTREAM *qss);
  * than two IOVs.)
  */
 int ossl_quic_sstream_get_stream_frame(QUIC_SSTREAM *qss,
-                                       size_t skip,
-                                       OSSL_QUIC_FRAME_STREAM *hdr,
-                                       OSSL_QTX_IOVEC *iov,
-                                       size_t *num_iov);
+    size_t skip,
+    OSSL_QUIC_FRAME_STREAM *hdr,
+    OSSL_QTX_IOVEC *iov,
+    size_t *num_iov);
 
 /*
  * Returns 1 if there is data pending transmission. Equivalent to calling
@@ -161,8 +161,8 @@ uint64_t ossl_quic_sstream_get_cur_size(QUIC_SSTREAM *qss);
  * Returns 1 on success and 0 on error (e.g. if end < start).
  */
 int ossl_quic_sstream_mark_transmitted(QUIC_SSTREAM *qss,
-                                       uint64_t start,
-                                       uint64_t end);
+    uint64_t start,
+    uint64_t end);
 
 /*
  * (For TX packetizer use.) Marks a STREAM frame with the FIN bit set as having
@@ -174,7 +174,7 @@ int ossl_quic_sstream_mark_transmitted(QUIC_SSTREAM *qss,
  * the QUIC_SSTREAM but is required as a sanity check.
  */
 int ossl_quic_sstream_mark_transmitted_fin(QUIC_SSTREAM *qss,
-                                           uint64_t final_size);
+    uint64_t final_size);
 
 /*
  * (RX/ACKM use.) Marks a logical range of the send stream as having been lost.
@@ -188,8 +188,8 @@ int ossl_quic_sstream_mark_transmitted_fin(QUIC_SSTREAM *qss,
  * Returns 1 on success and 0 on error (e.g. if end < start).
  */
 int ossl_quic_sstream_mark_lost(QUIC_SSTREAM *qss,
-                                uint64_t start,
-                                uint64_t end);
+    uint64_t start,
+    uint64_t end);
 
 /*
  * (RX/ACKM use.) Informs the QUIC_SSTREAM that a STREAM frame with the FIN bit
@@ -212,8 +212,8 @@ int ossl_quic_sstream_mark_lost_fin(QUIC_SSTREAM *qss);
  * Returns 1 on success and 0 on error (e.g. if end < start).
  */
 int ossl_quic_sstream_mark_acked(QUIC_SSTREAM *qss,
-                                 uint64_t start,
-                                 uint64_t end);
+    uint64_t start,
+    uint64_t end);
 
 /*
  * (RX/ACKM use.) Informs the QUIC_SSTREAM that a STREAM frame with the FIN bit
@@ -237,9 +237,9 @@ int ossl_quic_sstream_mark_acked_fin(QUIC_SSTREAM *qss);
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_sstream_append(QUIC_SSTREAM *qss,
-                             const unsigned char *buf,
-                             size_t buf_len,
-                             size_t *consumed);
+    const unsigned char *buf,
+    size_t buf_len,
+    size_t *consumed);
 
 /*
  * Marks a stream as finished. ossl_quic_sstream_append() may not be called anymore
@@ -292,8 +292,8 @@ size_t ossl_quic_sstream_get_buffer_avail(QUIC_SSTREAM *qss);
  * to 0 as necessary.
  */
 void ossl_quic_sstream_adjust_iov(size_t len,
-                                  OSSL_QTX_IOVEC *iov,
-                                  size_t num_iov);
+    OSSL_QTX_IOVEC *iov,
+    size_t num_iov);
 
 /*
  * Sets flag to cleanse the buffered data when it is acked.
@@ -322,7 +322,7 @@ void ossl_quic_sstream_set_cleanse(QUIC_SSTREAM *qss, int cleanse);
  * when ossl_quic_rstream_move_to_rbuf() is called.
  */
 QUIC_RSTREAM *ossl_quic_rstream_new(QUIC_RXFC *rxfc,
-                                    OSSL_STATM *statm, size_t rbuf_size);
+    OSSL_STATM *statm, size_t rbuf_size);
 
 /*
  * Frees a QUIC_RSTREAM and any associated storage.
@@ -340,9 +340,9 @@ void ossl_quic_rstream_free(QUIC_RSTREAM *qrs);
  */
 
 int ossl_quic_rstream_queue_data(QUIC_RSTREAM *qrs, OSSL_QRX_PKT *pkt,
-                                 uint64_t offset,
-                                 const unsigned char *data, uint64_t data_len,
-                                 int fin);
+    uint64_t offset,
+    const unsigned char *data, uint64_t data_len,
+    int fin);
 
 /*
  * Copies the data from the stream storage to buffer `buf` of size `size`.
@@ -351,7 +351,7 @@ int ossl_quic_rstream_queue_data(QUIC_RSTREAM *qrs, OSSL_QRX_PKT *pkt,
  * stream is finished. It is set to 0 otherwise.
  */
 int ossl_quic_rstream_read(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
-                           size_t *readbytes, int *fin);
+    size_t *readbytes, int *fin);
 
 /*
  * Peeks at the data in the stream storage. It copies them to buffer `buf`
@@ -360,7 +360,7 @@ int ossl_quic_rstream_read(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
  * It is set to 0 otherwise.
  */
 int ossl_quic_rstream_peek(QUIC_RSTREAM *qrs, unsigned char *buf, size_t size,
-                           size_t *readbytes, int *fin);
+    size_t *readbytes, int *fin);
 
 /*
  * Returns the size of the data available for reading. `fin` is set to 1 if
@@ -382,8 +382,8 @@ int ossl_quic_rstream_available(QUIC_RSTREAM *qrs, size_t *avail, int *fin);
  * without calling ossl_quic_rstream_release_record() in between.
  */
 int ossl_quic_rstream_get_record(QUIC_RSTREAM *qrs,
-                                 const unsigned char **record, size_t *rec_len,
-                                 int *fin);
+    const unsigned char **record, size_t *rec_len,
+    int *fin);
 
 /*
  * Releases (possibly partially) the record returned by
@@ -423,6 +423,6 @@ int ossl_quic_rstream_resize_rbuf(QUIC_RSTREAM *qrs, size_t rbuf_size);
  * Sets flag to cleanse the buffered data when user reads it.
  */
 void ossl_quic_rstream_set_cleanse(QUIC_RSTREAM *qrs, int cleanse);
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_stream_map.h b/include/internal/quic_stream_map.h
index 76834e743438..3d249009efa1 100644
--- a/include/internal/quic_stream_map.h
+++ b/include/internal/quic_stream_map.h
@@ -1,26 +1,26 @@
 /*
-* Copyright 2022-2025 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2022-2025 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_STREAM_MAP_H
-# define OSSL_INTERNAL_QUIC_STREAM_MAP_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_STREAM_MAP_H
+#pragma once
 
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/common.h"
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
-# include "internal/quic_stream.h"
-# include "internal/quic_fc.h"
-# include <openssl/lhash.h>
+#include "internal/e_os.h"
+#include "internal/time.h"
+#include "internal/common.h"
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_stream.h"
+#include "internal/quic_fc.h"
+#include <openssl/lhash.h>
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Stream
@@ -48,13 +48,13 @@ struct quic_stream_list_node_st {
  * need to keep the QUIC_SSTREAM and data buffers around. Of course, we also
  * don't have a QUIC_SSTREAM on a receive-only stream.
  */
-#define QUIC_SSTREAM_STATE_NONE         0   /* --- sstream == NULL  */
-#define QUIC_SSTREAM_STATE_READY        1   /* \                    */
-#define QUIC_SSTREAM_STATE_SEND         2   /* |-- sstream != NULL  */
-#define QUIC_SSTREAM_STATE_DATA_SENT    3   /* /                    */
-#define QUIC_SSTREAM_STATE_DATA_RECVD   4   /* \                    */
-#define QUIC_SSTREAM_STATE_RESET_SENT   5   /* |-- sstream == NULL  */
-#define QUIC_SSTREAM_STATE_RESET_RECVD  6   /* /                    */
+#define QUIC_SSTREAM_STATE_NONE 0 /* --- sstream == NULL  */
+#define QUIC_SSTREAM_STATE_READY 1 /* \                    */
+#define QUIC_SSTREAM_STATE_SEND 2 /* |-- sstream != NULL  */
+#define QUIC_SSTREAM_STATE_DATA_SENT 3 /* /                    */
+#define QUIC_SSTREAM_STATE_DATA_RECVD 4 /* \                    */
+#define QUIC_SSTREAM_STATE_RESET_SENT 5 /* |-- sstream == NULL  */
+#define QUIC_SSTREAM_STATE_RESET_RECVD 6 /* /                    */
 
 /*
  * QUIC Receive Stream States
@@ -69,13 +69,13 @@ struct quic_stream_list_node_st {
  * finished, we also don't need to keep the QUIC_RSTREAM around. Finally, we
  * don't need a QUIC_RSTREAM on a send-only stream.
  */
-#define QUIC_RSTREAM_STATE_NONE         0   /* --- rstream == NULL  */
-#define QUIC_RSTREAM_STATE_RECV         1   /* \                    */
-#define QUIC_RSTREAM_STATE_SIZE_KNOWN   2   /* |-- rstream != NULL  */
-#define QUIC_RSTREAM_STATE_DATA_RECVD   3   /* /                    */
-#define QUIC_RSTREAM_STATE_DATA_READ    4   /* \                    */
-#define QUIC_RSTREAM_STATE_RESET_RECVD  5   /* |-- rstream == NULL  */
-#define QUIC_RSTREAM_STATE_RESET_READ   6   /* /                    */
+#define QUIC_RSTREAM_STATE_NONE 0 /* --- rstream == NULL  */
+#define QUIC_RSTREAM_STATE_RECV 1 /* \                    */
+#define QUIC_RSTREAM_STATE_SIZE_KNOWN 2 /* |-- rstream != NULL  */
+#define QUIC_RSTREAM_STATE_DATA_RECVD 3 /* /                    */
+#define QUIC_RSTREAM_STATE_DATA_READ 4 /* \                    */
+#define QUIC_RSTREAM_STATE_RESET_RECVD 5 /* |-- rstream == NULL  */
+#define QUIC_RSTREAM_STATE_RESET_READ 6 /* /                    */
 
 struct quic_stream_st {
     QUIC_STREAM_LIST_NODE active_node; /* for use by QUIC_STREAM_MAP */
@@ -83,41 +83,41 @@ struct quic_stream_st {
     QUIC_STREAM_LIST_NODE ready_for_gc_node; /* queue of streams now ready for GC */
 
     /* Temporary link used by TXP. */
-    QUIC_STREAM    *txp_next;
+    QUIC_STREAM *txp_next;
 
     /*
      * QUIC Stream ID. Do not assume that this encodes a type as this is a
      * version-specific property and may change between QUIC versions; instead,
      * use the type field.
      */
-    uint64_t        id;
+    uint64_t id;
 
     /*
      * Application Error Code (AEC) used for STOP_SENDING frame.
      * This is only valid if stop_sending is 1.
      */
-    uint64_t        stop_sending_aec;
+    uint64_t stop_sending_aec;
 
     /*
      * Application Error Code (AEC) used for RESET_STREAM frame.
      * This is only valid if reset_stream is 1.
      */
-    uint64_t        reset_stream_aec;
+    uint64_t reset_stream_aec;
 
     /*
      * Application Error Code (AEC) for incoming STOP_SENDING frame.
      * This is only valid if peer_stop_sending is 1.
      */
-    uint64_t        peer_stop_sending_aec;
+    uint64_t peer_stop_sending_aec;
 
     /*
      * Application Error Code (AEC) for incoming RESET_STREAM frame.
      * This is only valid if peer_reset_stream is 1.
      */
-    uint64_t        peer_reset_stream_aec;
+    uint64_t peer_reset_stream_aec;
 
     /* Temporary value used by TXP. */
-    uint64_t        txp_txfc_new_credit_consumed;
+    uint64_t txp_txfc_new_credit_consumed;
 
     /*
      * The final size of the send stream. Although this information can be
@@ -130,7 +130,7 @@ struct quic_stream_st {
      * use ossl_quic_stream_recv_get_final_size or
      * ossl_quic_rxfc_get_final_size.
      */
-    uint64_t        send_final_size;
+    uint64_t send_final_size;
 
     /*
      * Send stream part and receive stream part buffer management objects.
@@ -148,20 +148,20 @@ struct quic_stream_st {
      * correspond with whether a stream's respective send or receive part
      * logically exists or not.
      */
-    QUIC_SSTREAM    *sstream;   /* NULL if RX-only */
-    QUIC_RSTREAM    *rstream;   /* NULL if TX only */
+    QUIC_SSTREAM *sstream; /* NULL if RX-only */
+    QUIC_RSTREAM *rstream; /* NULL if TX only */
 
     /* Stream-level flow control managers. */
-    QUIC_TXFC       txfc;       /* NULL if RX-only */
-    QUIC_RXFC       rxfc;       /* NULL if TX-only */
+    QUIC_TXFC txfc; /* NULL if RX-only */
+    QUIC_RXFC rxfc; /* NULL if TX-only */
 
-    unsigned int    type : 8; /* QUIC_STREAM_INITIATOR_*, QUIC_STREAM_DIR_* */
+    unsigned int type : 8; /* QUIC_STREAM_INITIATOR_*, QUIC_STREAM_DIR_* */
 
-    unsigned int    send_state : 8; /* QUIC_SSTREAM_STATE_* */
-    unsigned int    recv_state : 8; /* QUIC_RSTREAM_STATE_* */
+    unsigned int send_state : 8; /* QUIC_SSTREAM_STATE_* */
+    unsigned int recv_state : 8; /* QUIC_RSTREAM_STATE_* */
 
     /* 1 iff this QUIC_STREAM is on the active queue (invariant). */
-    unsigned int    active : 1;
+    unsigned int active : 1;
 
     /*
      * This is a copy of the QUIC connection as_server value, indicating
@@ -170,36 +170,36 @@ struct quic_stream_st {
      * perspective. It never changes after a QUIC_STREAM is created and is the
      * same for all QUIC_STREAMS under a QUIC_STREAM_MAP.
      */
-    unsigned int    as_server : 1;
+    unsigned int as_server : 1;
 
     /*
      * Has STOP_SENDING been requested (by us)? Note that this is not the same
      * as want_stop_sending below, as a STOP_SENDING frame may already have been
      * sent and fully acknowledged.
      */
-    unsigned int    stop_sending            : 1;
+    unsigned int stop_sending : 1;
 
     /*
      * Has RESET_STREAM been requested (by us)? Works identically to
      * STOP_SENDING for transmission purposes.
      */
     /* Has our peer sent a STOP_SENDING frame? */
-    unsigned int    peer_stop_sending       : 1;
+    unsigned int peer_stop_sending : 1;
 
     /* Temporary flags used by TXP. */
-    unsigned int    txp_sent_fc             : 1;
-    unsigned int    txp_sent_stop_sending   : 1;
-    unsigned int    txp_sent_reset_stream   : 1;
-    unsigned int    txp_drained             : 1;
-    unsigned int    txp_blocked             : 1;
+    unsigned int txp_sent_fc : 1;
+    unsigned int txp_sent_stop_sending : 1;
+    unsigned int txp_sent_reset_stream : 1;
+    unsigned int txp_drained : 1;
+    unsigned int txp_blocked : 1;
 
     /* Frame regeneration flags. */
-    unsigned int    want_max_stream_data    : 1; /* used for regen only */
-    unsigned int    want_stop_sending       : 1; /* used for gen or regen */
-    unsigned int    want_reset_stream       : 1; /* used for gen or regen */
+    unsigned int want_max_stream_data : 1; /* used for regen only */
+    unsigned int want_stop_sending : 1; /* used for gen or regen */
+    unsigned int want_reset_stream : 1; /* used for gen or regen */
 
     /* Flags set when frames *we* sent were acknowledged. */
-    unsigned int    acked_stop_sending      : 1;
+    unsigned int acked_stop_sending : 1;
 
     /*
      * The stream's XSO has been deleted. Pending GC.
@@ -309,20 +309,20 @@ struct quic_stream_st {
      *      Once these conditions are met, we can GC the QUIC_STREAM.
      *
      */
-    unsigned int    deleted                 : 1;
+    unsigned int deleted : 1;
     /* Set to 1 once the above conditions are actually met. */
-    unsigned int    ready_for_gc            : 1;
+    unsigned int ready_for_gc : 1;
     /* Set to 1 if this is currently counted in the shutdown flush stream count. */
-    unsigned int    shutdown_flush          : 1;
+    unsigned int shutdown_flush : 1;
 };
 
-#define QUIC_STREAM_INITIATOR_CLIENT        0
-#define QUIC_STREAM_INITIATOR_SERVER        1
-#define QUIC_STREAM_INITIATOR_MASK          1
+#define QUIC_STREAM_INITIATOR_CLIENT 0
+#define QUIC_STREAM_INITIATOR_SERVER 1
+#define QUIC_STREAM_INITIATOR_MASK 1
 
-#define QUIC_STREAM_DIR_BIDI                0
-#define QUIC_STREAM_DIR_UNI                 2
-#define QUIC_STREAM_DIR_MASK                2
+#define QUIC_STREAM_DIR_BIDI 0
+#define QUIC_STREAM_DIR_UNI 2
+#define QUIC_STREAM_DIR_MASK 2
 
 void ossl_quic_stream_check(const QUIC_STREAM *s);
 
@@ -453,7 +453,7 @@ static ossl_inline ossl_unused int ossl_quic_stream_recv_is_reset(const QUIC_STR
  * undefined value otherwise.
  */
 static ossl_inline ossl_unused int ossl_quic_stream_send_get_final_size(const QUIC_STREAM *s,
-                                                                        uint64_t *final_size)
+    uint64_t *final_size)
 {
     switch (s->send_state) {
     default:
@@ -483,7 +483,7 @@ static ossl_inline ossl_unused int ossl_quic_stream_send_get_final_size(const QU
  * undefined value otherwise.
  */
 static ossl_inline ossl_unused int ossl_quic_stream_recv_get_final_size(const QUIC_STREAM *s,
-                                                                        uint64_t *final_size)
+    uint64_t *final_size)
 {
     switch (s->recv_state) {
     default:
@@ -509,7 +509,7 @@ static ossl_inline ossl_unused int ossl_quic_stream_recv_get_final_size(const QU
  * include_fin is 1) whether a FIN or reset has yet to be read.
  */
 static ossl_inline ossl_unused int ossl_quic_stream_recv_pending(const QUIC_STREAM *s,
-                                                                 int include_fin)
+    int include_fin)
 {
     size_t avail;
     int fin = 0;
@@ -552,18 +552,18 @@ static ossl_inline ossl_unused int ossl_quic_stream_recv_pending(const QUIC_STRE
  *
  */
 struct quic_stream_map_st {
-    LHASH_OF(QUIC_STREAM)   *map;
-    QUIC_STREAM_LIST_NODE   active_list;
-    QUIC_STREAM_LIST_NODE   accept_list;
-    QUIC_STREAM_LIST_NODE   ready_for_gc_list;
-    size_t                  rr_stepping, rr_counter;
-    size_t                  num_accept_bidi, num_accept_uni, num_shutdown_flush;
-    QUIC_STREAM             *rr_cur;
-    uint64_t                (*get_stream_limit_cb)(int uni, void *arg);
-    void                    *get_stream_limit_cb_arg;
-    QUIC_RXFC               *max_streams_bidi_rxfc;
-    QUIC_RXFC               *max_streams_uni_rxfc;
-    int                     is_server;
+    LHASH_OF(QUIC_STREAM) *map;
+    QUIC_STREAM_LIST_NODE active_list;
+    QUIC_STREAM_LIST_NODE accept_list;
+    QUIC_STREAM_LIST_NODE ready_for_gc_list;
+    size_t rr_stepping, rr_counter;
+    size_t num_accept_bidi, num_accept_uni, num_shutdown_flush;
+    QUIC_STREAM *rr_cur;
+    uint64_t (*get_stream_limit_cb)(int uni, void *arg);
+    void *get_stream_limit_cb_arg;
+    QUIC_RXFC *max_streams_bidi_rxfc;
+    QUIC_RXFC *max_streams_uni_rxfc;
+    int is_server;
 };
 
 /*
@@ -580,11 +580,11 @@ struct quic_stream_map_st {
  * a stream.
  */
 int ossl_quic_stream_map_init(QUIC_STREAM_MAP *qsm,
-                              uint64_t (*get_stream_limit_cb)(int uni, void *arg),
-                              void *get_stream_limit_cb_arg,
-                              QUIC_RXFC *max_streams_bidi_rxfc,
-                              QUIC_RXFC *max_streams_uni_rxfc,
-                              int is_server);
+    uint64_t (*get_stream_limit_cb)(int uni, void *arg),
+    void *get_stream_limit_cb_arg,
+    QUIC_RXFC *max_streams_bidi_rxfc,
+    QUIC_RXFC *max_streams_uni_rxfc,
+    int is_server);
 
 /*
  * Any streams still in the map will be released as though
@@ -602,8 +602,8 @@ void ossl_quic_stream_map_cleanup(QUIC_STREAM_MAP *qsm);
  * with the given ID.
  */
 QUIC_STREAM *ossl_quic_stream_map_alloc(QUIC_STREAM_MAP *qsm,
-                                        uint64_t stream_id,
-                                        int type);
+    uint64_t stream_id,
+    int type);
 
 /*
  * Releases a stream object. Note that this must only be done once the teardown
@@ -616,14 +616,14 @@ void ossl_quic_stream_map_release(QUIC_STREAM_MAP *qsm, QUIC_STREAM *stream);
  * argument which is passed through.
  */
 void ossl_quic_stream_map_visit(QUIC_STREAM_MAP *qsm,
-                                void (*visit_cb)(QUIC_STREAM *stream, void *arg),
-                                void *visit_cb_arg);
+    void (*visit_cb)(QUIC_STREAM *stream, void *arg),
+    void *visit_cb_arg);
 
 /*
  * Retrieves a stream by stream ID. Returns NULL if it does not exist.
  */
 QUIC_STREAM *ossl_quic_stream_map_get_by_id(QUIC_STREAM_MAP *qsm,
-                                            uint64_t stream_id);
+    uint64_t stream_id);
 
 /*
  * Marks the given stream as active or inactive based on its state. Idempotent.
@@ -652,8 +652,8 @@ void ossl_quic_stream_map_set_rr_stepping(QUIC_STREAM_MAP *qsm, size_t stepping)
  * Note that stream_ordinal is a stream ordinal, not a stream ID.
  */
 int ossl_quic_stream_map_is_local_allowed_by_stream_limit(QUIC_STREAM_MAP *qsm,
-                                                          uint64_t stream_ordinal,
-                                                          int is_uni);
+    uint64_t stream_ordinal,
+    int is_uni);
 
 /*
  * Stream Send Part
@@ -678,7 +678,7 @@ int ossl_quic_stream_map_is_local_allowed_by_stream_limit(QUIC_STREAM_MAP *qsm,
  * Returns 0 if there is no send part (caller error) and 1 otherwise.
  */
 int ossl_quic_stream_map_ensure_send_part_id(QUIC_STREAM_MAP *qsm,
-                                             QUIC_STREAM *qs);
+    QUIC_STREAM *qs);
 
 /*
  * Transitions from SEND to the DATA_SENT state. Note that this is NOT the same
@@ -693,7 +693,7 @@ int ossl_quic_stream_map_ensure_send_part_id(QUIC_STREAM_MAP *qsm,
  * because the send part is not in the SEND state.
  */
 int ossl_quic_stream_map_notify_all_data_sent(QUIC_STREAM_MAP *qsm,
-                                              QUIC_STREAM *qs);
+    QUIC_STREAM *qs);
 
 /*
  * Transitions from the DATA_SENT to DATA_RECVD state; should be called
@@ -707,7 +707,7 @@ int ossl_quic_stream_map_notify_all_data_sent(QUIC_STREAM_MAP *qsm,
  * function to succeed.
  */
 int ossl_quic_stream_map_notify_totally_acked(QUIC_STREAM_MAP *qsm,
-                                              QUIC_STREAM *qs);
+    QUIC_STREAM *qs);
 
 /*
  * Resets the sending part of a stream. This is a transition from the READY,
@@ -721,8 +721,8 @@ int ossl_quic_stream_map_notify_totally_acked(QUIC_STREAM_MAP *qsm,
  * in this state. It also returns 0 if there is no send part (caller error).
  */
 int ossl_quic_stream_map_reset_stream_send_part(QUIC_STREAM_MAP *qsm,
-                                                QUIC_STREAM *qs,
-                                                uint64_t aec);
+    QUIC_STREAM *qs,
+    uint64_t aec);
 
 /*
  * Transitions from the RESET_SENT to the RESET_RECVD state. This should be
@@ -738,8 +738,7 @@ int ossl_quic_stream_map_reset_stream_send_part(QUIC_STREAM_MAP *qsm,
  * (caller error).
  */
 int ossl_quic_stream_map_notify_reset_stream_acked(QUIC_STREAM_MAP *qsm,
-                                                   QUIC_STREAM *qs);
-
+    QUIC_STREAM *qs);
 
 /*
  * Stream Receive Part
@@ -754,8 +753,8 @@ int ossl_quic_stream_map_notify_reset_stream_acked(QUIC_STREAM_MAP *qsm,
  * Returns 1 if the transition was taken.
  */
 int ossl_quic_stream_map_notify_size_known_recv_part(QUIC_STREAM_MAP *qsm,
-                                                     QUIC_STREAM *qs,
-                                                     uint64_t final_size);
+    QUIC_STREAM *qs,
+    uint64_t final_size);
 
 /*
  * Transitions from the SIZE_KNOWN receive stream state to the DATA_RECVD state.
@@ -764,7 +763,7 @@ int ossl_quic_stream_map_notify_size_known_recv_part(QUIC_STREAM_MAP *qsm,
  * Returns 1 if the transition was taken.
  */
 int ossl_quic_stream_map_notify_totally_received(QUIC_STREAM_MAP *qsm,
-                                                 QUIC_STREAM *qs);
+    QUIC_STREAM *qs);
 
 /*
  * Transitions from the DATA_RECVD receive stream state to the DATA_READ state.
@@ -774,7 +773,7 @@ int ossl_quic_stream_map_notify_totally_received(QUIC_STREAM_MAP *qsm,
  * Returns 1 if the transition was taken.
  */
 int ossl_quic_stream_map_notify_totally_read(QUIC_STREAM_MAP *qsm,
-                                             QUIC_STREAM *qs);
+    QUIC_STREAM *qs);
 
 /*
  * Transitions from the RECV, SIZE_KNOWN or DATA_RECVD receive stream state to
@@ -783,9 +782,9 @@ int ossl_quic_stream_map_notify_totally_read(QUIC_STREAM_MAP *qsm,
  * Returns 1 if the transition was taken.
  */
 int ossl_quic_stream_map_notify_reset_recv_part(QUIC_STREAM_MAP *qsm,
-                                                QUIC_STREAM *qs,
-                                                uint64_t app_error_code,
-                                                uint64_t final_size);
+    QUIC_STREAM *qs,
+    uint64_t app_error_code,
+    uint64_t final_size);
 
 /*
  * Transitions from the RESET_RECVD receive stream state to the RESET_READ
@@ -793,7 +792,7 @@ int ossl_quic_stream_map_notify_reset_recv_part(QUIC_STREAM_MAP *qsm,
  * of a stream reset.
  */
 int ossl_quic_stream_map_notify_app_read_reset_recv_part(QUIC_STREAM_MAP *qsm,
-                                                         QUIC_STREAM *qs);
+    QUIC_STREAM *qs);
 
 /*
  * Marks the receiving part of a stream for STOP_SENDING. This is orthogonal to
@@ -804,8 +803,8 @@ int ossl_quic_stream_map_notify_app_read_reset_recv_part(QUIC_STREAM_MAP *qsm,
  * Returns 0 otherwise, which need not be considered an error.
  */
 int ossl_quic_stream_map_stop_sending_recv_part(QUIC_STREAM_MAP *qsm,
-                                                QUIC_STREAM *qs,
-                                                uint64_t aec);
+    QUIC_STREAM *qs,
+    uint64_t aec);
 
 /*
  * Marks the stream as wanting a STOP_SENDING frame transmitted. It is not valid
@@ -813,8 +812,7 @@ int ossl_quic_stream_map_stop_sending_recv_part(QUIC_STREAM_MAP *qsm,
  * called. For TXP use.
  */
 int ossl_quic_stream_map_schedule_stop_sending(QUIC_STREAM_MAP *qsm,
-                                               QUIC_STREAM *qs);
-
+    QUIC_STREAM *qs);
 
 /*
  * Accept Queue Management
@@ -825,7 +823,7 @@ int ossl_quic_stream_map_schedule_stop_sending(QUIC_STREAM_MAP *qsm,
  * Adds a stream to the accept queue.
  */
 void ossl_quic_stream_map_push_accept_queue(QUIC_STREAM_MAP *qsm,
-                                            QUIC_STREAM *s);
+    QUIC_STREAM *s);
 
 /*
  * Returns the next item to be popped from the accept queue, or NULL if it is
@@ -840,8 +838,8 @@ QUIC_STREAM *ossl_quic_stream_map_peek_accept_queue(QUIC_STREAM_MAP *qsm);
  * Precondition: s is in the accept queue.
  */
 void ossl_quic_stream_map_remove_from_accept_queue(QUIC_STREAM_MAP *qsm,
-                                                   QUIC_STREAM *s,
-                                                   OSSL_TIME rtt);
+    QUIC_STREAM *s,
+    OSSL_TIME rtt);
 
 /* Returns the length of the accept queue for the given stream type. */
 size_t ossl_quic_stream_map_get_accept_queue_len(QUIC_STREAM_MAP *qsm, int is_uni);
@@ -894,8 +892,8 @@ int ossl_quic_stream_map_is_shutdown_flush_finished(QUIC_STREAM_MAP *qsm);
  *
  */
 typedef struct quic_stream_iter_st {
-    QUIC_STREAM_MAP     *qsm;
-    QUIC_STREAM         *first_stream, *stream;
+    QUIC_STREAM_MAP *qsm;
+    QUIC_STREAM *first_stream, *stream;
 } QUIC_STREAM_ITER;
 
 /*
@@ -904,7 +902,7 @@ typedef struct quic_stream_iter_st {
  * the iteration sequence, or NULL if there are no active streams.
  */
 void ossl_quic_stream_iter_init(QUIC_STREAM_ITER *it, QUIC_STREAM_MAP *qsm,
-                                int advance_rr);
+    int advance_rr);
 
 /*
  * Advances to next stream in iteration sequence. You do not need to call this
@@ -913,6 +911,6 @@ void ossl_quic_stream_iter_init(QUIC_STREAM_ITER *it, QUIC_STREAM_MAP *qsm,
  */
 void ossl_quic_stream_iter_next(QUIC_STREAM_ITER *it);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_thread_assist.h b/include/internal/quic_thread_assist.h
index 12d9750ad331..fbfac146dab0 100644
--- a/include/internal/quic_thread_assist.h
+++ b/include/internal/quic_thread_assist.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OSSL_QUIC_THREAD_ASSIST_H
-# define OSSL_QUIC_THREAD_ASSIST_H
+#define OSSL_QUIC_THREAD_ASSIST_H
 
-# include <openssl/ssl.h>
-# include "internal/thread.h"
-# include "internal/time.h"
+#include <openssl/ssl.h>
+#include "internal/thread.h"
+#include "internal/time.h"
 
-# if defined(OPENSSL_NO_QUIC) || defined(OPENSSL_NO_THREAD_POOL)
-#  define OPENSSL_NO_QUIC_THREAD_ASSIST
-# endif
+#if defined(OPENSSL_NO_QUIC) || defined(OPENSSL_NO_THREAD_POOL)
+#define OPENSSL_NO_QUIC_THREAD_ASSIST
+#endif
 
-# ifndef OPENSSL_NO_QUIC_THREAD_ASSIST
+#ifndef OPENSSL_NO_QUIC_THREAD_ASSIST
 
 /*
  * QUIC Thread Assisted Functionality
@@ -56,7 +56,7 @@ typedef struct quic_thread_assist_st {
  * not affect the state of the mutex.
  */
 int ossl_quic_thread_assist_init_start(QUIC_THREAD_ASSIST *qta,
-                                       QUIC_CHANNEL *ch);
+    QUIC_CHANNEL *ch);
 
 /*
  * Request the thread assist helper to begin stopping the assist thread. This
@@ -93,6 +93,6 @@ int ossl_quic_thread_assist_cleanup(QUIC_THREAD_ASSIST *qta);
  */
 int ossl_quic_thread_assist_notify_deadline_changed(QUIC_THREAD_ASSIST *qta);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_tls.h b/include/internal/quic_tls.h
index ec0d07da0b39..707f7df9e37c 100644
--- a/include/internal/quic_tls.h
+++ b/include/internal/quic_tls.h
@@ -8,9 +8,9 @@
  */
 
 #ifndef OSSL_QUIC_TLS_H
-# define OSSL_QUIC_TLS_H
+#define OSSL_QUIC_TLS_H
 
-# include <openssl/ssl.h>
+#include <openssl/ssl.h>
 
 typedef struct quic_tls_st QUIC_TLS;
 
@@ -28,7 +28,7 @@ typedef struct quic_tls_args_st {
      * current EL.
      */
     int (*crypto_send_cb)(const unsigned char *buf, size_t buf_len,
-                          size_t *consumed, void *arg);
+        size_t *consumed, void *arg);
     void *crypto_send_cb_arg;
 
     /*
@@ -37,7 +37,7 @@ typedef struct quic_tls_args_st {
      * data.
      */
     int (*crypto_recv_rcd_cb)(const unsigned char **buf, size_t *bytes_read,
-                              void *arg);
+        void *arg);
     void *crypto_recv_rcd_cb_arg;
     int (*crypto_release_rcd_cb)(size_t bytes_read, void *arg);
     void *crypto_release_rcd_cb_arg;
@@ -47,9 +47,9 @@ typedef struct quic_tls_args_st {
      * level.
      */
     int (*yield_secret_cb)(uint32_t prot_level, int direction /* 0=RX, 1=TX */,
-                           uint32_t suite_id, EVP_MD *md,
-                           const unsigned char *secret, size_t secret_len,
-                           void *arg);
+        uint32_t suite_id, EVP_MD *md,
+        const unsigned char *secret, size_t secret_len,
+        void *arg);
     void *yield_secret_cb_arg;
 
     /*
@@ -59,8 +59,8 @@ typedef struct quic_tls_args_st {
      * marked as completed.
      */
     int (*got_transport_params_cb)(const unsigned char *params,
-                                   size_t params_len,
-                                   void *arg);
+        size_t params_len,
+        void *arg);
     void *got_transport_params_cb_arg;
 
     /*
@@ -99,13 +99,13 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls);
 void ossl_quic_tls_clear(QUIC_TLS *qtls);
 
 int ossl_quic_tls_set_transport_params(QUIC_TLS *qtls,
-                                       const unsigned char *transport_params,
-                                       size_t transport_params_len);
+    const unsigned char *transport_params,
+    size_t transport_params_len);
 
 int ossl_quic_tls_get_error(QUIC_TLS *qtls,
-                            uint64_t *error_code,
-                            const char **error_msg,
-                            ERR_STATE **error_state);
+    uint64_t *error_code,
+    const char **error_msg,
+    ERR_STATE **error_state);
 
 int ossl_quic_tls_is_cert_request(QUIC_TLS *qtls);
 int ossl_quic_tls_has_bad_max_early_data(QUIC_TLS *qtls);
diff --git a/include/internal/quic_trace.h b/include/internal/quic_trace.h
index fb3742799641..f462ce0c0090 100644
--- a/include/internal/quic_trace.h
+++ b/include/internal/quic_trace.h
@@ -8,13 +8,13 @@
  */
 
 #ifndef OSSL_QUIC_TRACE_H
-# define OSSL_QUIC_TRACE_H
+#define OSSL_QUIC_TRACE_H
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 int ossl_quic_trace(int write_p, int version, int content_type,
-                    const void *buf, size_t msglen, SSL *ssl, void *arg);
+    const void *buf, size_t msglen, SSL *ssl, void *arg);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_tserver.h b/include/internal/quic_tserver.h
index 30439bd8535e..91516b1876a1 100644
--- a/include/internal/quic_tserver.h
+++ b/include/internal/quic_tserver.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OSSL_QUIC_TSERVER_H
-# define OSSL_QUIC_TSERVER_H
+#define OSSL_QUIC_TSERVER_H
 
-# include <openssl/ssl.h>
-# include <openssl/bio.h>
-# include "internal/quic_stream.h"
-# include "internal/quic_channel.h"
-# include "internal/statem.h"
-# include "internal/time.h"
+#include <openssl/ssl.h>
+#include <openssl/bio.h>
+#include "internal/quic_stream.h"
+#include "internal/quic_channel.h"
+#include "internal/statem.h"
+#include "internal/time.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Test Server Module
@@ -46,20 +46,20 @@ typedef struct quic_tserver_args_st {
 } QUIC_TSERVER_ARGS;
 
 QUIC_TSERVER *ossl_quic_tserver_new(const QUIC_TSERVER_ARGS *args,
-                                    const char *certfile, const char *keyfile);
+    const char *certfile, const char *keyfile);
 
 void ossl_quic_tserver_free(QUIC_TSERVER *srv);
 
 /* Set mutator callbacks for test framework support */
 int ossl_quic_tserver_set_plain_packet_mutator(QUIC_TSERVER *srv,
-                                               ossl_mutate_packet_cb mutatecb,
-                                               ossl_finish_mutate_cb finishmutatecb,
-                                               void *mutatearg);
+    ossl_mutate_packet_cb mutatecb,
+    ossl_finish_mutate_cb finishmutatecb,
+    void *mutatearg);
 
 int ossl_quic_tserver_set_handshake_mutator(QUIC_TSERVER *srv,
-                                            ossl_statem_mutate_handshake_cb mutate_handshake_cb,
-                                            ossl_statem_finish_mutate_handshake_cb finish_mutate_handshake_cb,
-                                            void *mutatearg);
+    ossl_statem_mutate_handshake_cb mutate_handshake_cb,
+    ossl_statem_finish_mutate_handshake_cb finish_mutate_handshake_cb,
+    void *mutatearg);
 
 /* Advances the state machine. */
 int ossl_quic_tserver_tick(QUIC_TSERVER *srv);
@@ -94,10 +94,10 @@ size_t ossl_quic_tserver_get_short_header_conn_id_len(const QUIC_TSERVER *srv);
  * ossl_quic_tserver_has_read_ended() to identify this condition.
  */
 int ossl_quic_tserver_read(QUIC_TSERVER *srv,
-                           uint64_t stream_id,
-                           unsigned char *buf,
-                           size_t buf_len,
-                           size_t *bytes_read);
+    uint64_t stream_id,
+    unsigned char *buf,
+    size_t buf_len,
+    size_t *bytes_read);
 
 /*
  * Returns 1 if the read part of the stream has ended normally.
@@ -116,10 +116,10 @@ int ossl_quic_tserver_has_read_ended(QUIC_TSERVER *srv, uint64_t stream_id);
  * Returns 0 if connection is not currently active.
  */
 int ossl_quic_tserver_write(QUIC_TSERVER *srv,
-                            uint64_t stream_id,
-                            const unsigned char *buf,
-                            size_t buf_len,
-                            size_t *bytes_written);
+    uint64_t stream_id,
+    const unsigned char *buf,
+    size_t buf_len,
+    size_t *bytes_written);
 
 /*
  * Signals normal end of the stream.
@@ -131,8 +131,8 @@ int ossl_quic_tserver_conclude(QUIC_TSERVER *srv, uint64_t stream_id);
  * created stream is written to *stream_id.
  */
 int ossl_quic_tserver_stream_new(QUIC_TSERVER *srv,
-                                 int is_uni,
-                                 uint64_t *stream_id);
+    int is_uni,
+    uint64_t *stream_id);
 
 BIO *ossl_quic_tserver_get0_rbio(QUIC_TSERVER *srv);
 
@@ -143,22 +143,22 @@ SSL_CTX *ossl_quic_tserver_get0_ssl_ctx(QUIC_TSERVER *srv);
  * app_error_code is written if this returns 1.
  */
 int ossl_quic_tserver_stream_has_peer_stop_sending(QUIC_TSERVER *srv,
-                                                   uint64_t stream_id,
-                                                   uint64_t *app_error_code);
+    uint64_t stream_id,
+    uint64_t *app_error_code);
 
 /*
  * Returns 1 if the peer has sent a RESET_STREAM frame for a stream.
  * app_error_code is written if this returns 1.
  */
 int ossl_quic_tserver_stream_has_peer_reset_stream(QUIC_TSERVER *srv,
-                                                   uint64_t stream_id,
-                                                   uint64_t *app_error_code);
+    uint64_t stream_id,
+    uint64_t *app_error_code);
 
 /*
  * Replaces existing local connection ID in the underlying QUIC_CHANNEL.
  */
 int ossl_quic_tserver_set_new_local_cid(QUIC_TSERVER *srv,
-                                        const QUIC_CONN_ID *conn_id);
+    const QUIC_CONN_ID *conn_id);
 
 /*
  * Returns the stream ID of the next incoming stream, or UINT64_MAX if there
@@ -170,7 +170,7 @@ uint64_t ossl_quic_tserver_pop_incoming_stream(QUIC_TSERVER *srv);
  * Returns 1 if all data sent on the given stream_id has been acked by the peer.
  */
 int ossl_quic_tserver_is_stream_totally_acked(QUIC_TSERVER *srv,
-                                              uint64_t stream_id);
+    uint64_t stream_id);
 
 /* Returns 1 if we are currently interested in reading data from the network */
 int ossl_quic_tserver_get_net_read_desired(QUIC_TSERVER *srv);
@@ -192,11 +192,11 @@ int ossl_quic_tserver_ping(QUIC_TSERVER *srv);
 
 /* Set tracing callback on channel. */
 void ossl_quic_tserver_set_msg_callback(QUIC_TSERVER *srv,
-                                        void (*f)(int write_p, int version,
-                                                  int content_type,
-                                                  const void *buf, size_t len,
-                                                  SSL *ssl, void *arg),
-                                        void *arg);
+    void (*f)(int write_p, int version,
+        int content_type,
+        const void *buf, size_t len,
+        SSL *ssl, void *arg),
+    void *arg);
 
 /*
  * This is similar to ossl_quic_conn_get_channel; it should be used for test
@@ -212,12 +212,12 @@ int ossl_quic_tserver_new_ticket(QUIC_TSERVER *srv);
  * values 0 and 0xffffffff are valid for use in QUIC.
  */
 int ossl_quic_tserver_set_max_early_data(QUIC_TSERVER *srv,
-                                         uint32_t max_early_data);
+    uint32_t max_early_data);
 
 /* Set the find session callback for getting a server PSK */
 void ossl_quic_tserver_set_psk_find_session_cb(QUIC_TSERVER *srv,
-                                               SSL_psk_find_session_cb_func cb);
+    SSL_psk_find_session_cb_func cb);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h
index b76308e5878f..d94a79620d27 100644
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -8,22 +8,22 @@
  */
 
 #ifndef OSSL_QUIC_TXP_H
-# define OSSL_QUIC_TXP_H
+#define OSSL_QUIC_TXP_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
-# include "internal/quic_record_tx.h"
-# include "internal/quic_cfq.h"
-# include "internal/quic_txpim.h"
-# include "internal/quic_stream.h"
-# include "internal/quic_stream_map.h"
-# include "internal/quic_fc.h"
-# include "internal/bio_addr.h"
-# include "internal/time.h"
-# include "internal/qlog.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_record_tx.h"
+#include "internal/quic_cfq.h"
+#include "internal/quic_txpim.h"
+#include "internal/quic_stream.h"
+#include "internal/quic_stream_map.h"
+#include "internal/quic_fc.h"
+#include "internal/bio_addr.h"
+#include "internal/time.h"
+#include "internal/qlog.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC TX Packetiser
@@ -31,28 +31,28 @@
  */
 typedef struct ossl_quic_tx_packetiser_args_st {
     /* Configuration Settings */
-    QUIC_CONN_ID    cur_scid;   /* Current Source Connection ID we use. */
-    QUIC_CONN_ID    cur_dcid;   /* Current Destination Connection ID we use. */
-    BIO_ADDR        peer;       /* Current destination L4 address we use. */
-    uint32_t        ack_delay_exponent; /* ACK delay exponent used when encoding. */
+    QUIC_CONN_ID cur_scid; /* Current Source Connection ID we use. */
+    QUIC_CONN_ID cur_dcid; /* Current Destination Connection ID we use. */
+    BIO_ADDR peer; /* Current destination L4 address we use. */
+    uint32_t ack_delay_exponent; /* ACK delay exponent used when encoding. */
 
     /* Injected Dependencies */
-    OSSL_QTX        *qtx;       /* QUIC Record Layer TX we are using */
-    QUIC_TXPIM      *txpim;     /* QUIC TX'd Packet Information Manager */
-    QUIC_CFQ        *cfq;       /* QUIC Control Frame Queue */
-    OSSL_ACKM       *ackm;      /* QUIC Acknowledgement Manager */
-    QUIC_STREAM_MAP *qsm;       /* QUIC Streams Map */
-    QUIC_TXFC       *conn_txfc; /* QUIC Connection-Level TX Flow Controller */
-    QUIC_RXFC       *conn_rxfc; /* QUIC Connection-Level RX Flow Controller */
-    QUIC_RXFC       *max_streams_bidi_rxfc; /* QUIC RXFC for MAX_STREAMS generation */
-    QUIC_RXFC       *max_streams_uni_rxfc;
+    OSSL_QTX *qtx; /* QUIC Record Layer TX we are using */
+    QUIC_TXPIM *txpim; /* QUIC TX'd Packet Information Manager */
+    QUIC_CFQ *cfq; /* QUIC Control Frame Queue */
+    OSSL_ACKM *ackm; /* QUIC Acknowledgement Manager */
+    QUIC_STREAM_MAP *qsm; /* QUIC Streams Map */
+    QUIC_TXFC *conn_txfc; /* QUIC Connection-Level TX Flow Controller */
+    QUIC_RXFC *conn_rxfc; /* QUIC Connection-Level RX Flow Controller */
+    QUIC_RXFC *max_streams_bidi_rxfc; /* QUIC RXFC for MAX_STREAMS generation */
+    QUIC_RXFC *max_streams_uni_rxfc;
     const OSSL_CC_METHOD *cc_method; /* QUIC Congestion Controller */
-    OSSL_CC_DATA    *cc_data;   /* QUIC Congestion Controller Instance */
-    OSSL_TIME       (*now)(void *arg);  /* Callback to get current time. */
-    void            *now_arg;
-    QLOG            *(*get_qlog_cb)(void *arg); /* Optional QLOG retrieval func */
-    void            *get_qlog_cb_arg;
-    uint32_t        protocol_version; /* The protocol version to try negotiating */
+    OSSL_CC_DATA *cc_data; /* QUIC Congestion Controller Instance */
+    OSSL_TIME (*now)(void *arg); /* Callback to get current time. */
+    void *now_arg;
+    QLOG *(*get_qlog_cb)(void *arg); /* Optional QLOG retrieval func */
+    void *get_qlog_cb_arg;
+    uint32_t protocol_version; /* The protocol version to try negotiating */
 
     /*
      * Injected dependencies - crypto streams.
@@ -60,22 +60,22 @@ typedef struct ossl_quic_tx_packetiser_args_st {
      * Note: There is no crypto stream for the 0-RTT EL.
      *       crypto[QUIC_PN_SPACE_APP] is the 1-RTT crypto stream.
      */
-    QUIC_SSTREAM    *crypto[QUIC_PN_SPACE_NUM];
+    QUIC_SSTREAM *crypto[QUIC_PN_SPACE_NUM];
 
- } OSSL_QUIC_TX_PACKETISER_ARGS;
+} OSSL_QUIC_TX_PACKETISER_ARGS;
 
 OSSL_QUIC_TX_PACKETISER *ossl_quic_tx_packetiser_new(const OSSL_QUIC_TX_PACKETISER_ARGS *args);
 
 void ossl_quic_tx_packetiser_set_validated(OSSL_QUIC_TX_PACKETISER *txp);
 void ossl_quic_tx_packetiser_add_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp,
-                                                    size_t credit);
+    size_t credit);
 void ossl_quic_tx_packetiser_consume_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp,
-                                                        size_t credit);
+    size_t credit);
 int ossl_quic_tx_packetiser_check_unvalidated_credit(OSSL_QUIC_TX_PACKETISER *txp,
-                                                     size_t req_credit);
+    size_t req_credit);
 
-typedef void (ossl_quic_initial_token_free_fn)(const unsigned char *buf,
-                                               size_t buf_len, void *arg);
+typedef void(ossl_quic_initial_token_free_fn)(const unsigned char *buf,
+    size_t buf_len, void *arg);
 
 void ossl_quic_tx_packetiser_free(OSSL_QUIC_TX_PACKETISER *txp);
 
@@ -85,7 +85,7 @@ void ossl_quic_tx_packetiser_free(OSSL_QUIC_TX_PACKETISER *txp);
  * Refer RFC 9000 s. 10.2.1 Closing Connection State.
  */
 void ossl_quic_tx_packetiser_record_received_closing_bytes(
-        OSSL_QUIC_TX_PACKETISER *txp, size_t n);
+    OSSL_QUIC_TX_PACKETISER *txp, size_t n);
 
 /*
  * Generates a datagram by polling the various ELs to determine if they want to
@@ -106,7 +106,7 @@ typedef struct quic_txp_status_st {
 } QUIC_TXP_STATUS;
 
 int ossl_quic_tx_packetiser_generate(OSSL_QUIC_TX_PACKETISER *txp,
-                                     QUIC_TXP_STATUS *status);
+    QUIC_TXP_STATUS *status);
 
 /*
  * Returns a deadline after which a call to ossl_quic_tx_packetiser_generate()
@@ -128,39 +128,39 @@ OSSL_TIME ossl_quic_tx_packetiser_get_deadline(OSSL_QUIC_TX_PACKETISER *txp);
  * understanding of our PMTU.
  */
 int ossl_quic_tx_packetiser_set_initial_token(OSSL_QUIC_TX_PACKETISER *txp,
-                                              const unsigned char *token,
-                                              size_t token_len,
-                                              ossl_quic_initial_token_free_fn *free_cb,
-                                              void *free_cb_arg);
+    const unsigned char *token,
+    size_t token_len,
+    ossl_quic_initial_token_free_fn *free_cb,
+    void *free_cb_arg);
 
 /*
  * Set the protocol version used when generating packets.  Currently should
  * only ever be set to QUIC_VERSION_1
  */
 int ossl_quic_tx_packetiser_set_protocol_version(OSSL_QUIC_TX_PACKETISER *txp,
-                                                 uint32_t protocol_version);
+    uint32_t protocol_version);
 
 /* Change the DCID the TXP uses to send outgoing packets. */
 int ossl_quic_tx_packetiser_set_cur_dcid(OSSL_QUIC_TX_PACKETISER *txp,
-                                         const QUIC_CONN_ID *dcid);
+    const QUIC_CONN_ID *dcid);
 
 /* Change the SCID the TXP uses to send outgoing (long) packets. */
 int ossl_quic_tx_packetiser_set_cur_scid(OSSL_QUIC_TX_PACKETISER *txp,
-                                         const QUIC_CONN_ID *scid);
+    const QUIC_CONN_ID *scid);
 
 /*
  * Change the destination L4 address the TXP uses to send datagrams. Specify
  * NULL (or AF_UNSPEC) to disable use of addressed mode.
  */
 int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
-                                     const BIO_ADDR *peer);
+    const BIO_ADDR *peer);
 
 /*
  * Change the QLOG instance retrieval function in use after instantiation.
  */
 void ossl_quic_tx_packetiser_set_qlog_cb(OSSL_QUIC_TX_PACKETISER *txp,
-                                         QLOG *(*get_qlog_cb)(void *arg),
-                                         void *get_qlog_cb_arg);
+    QLOG *(*get_qlog_cb)(void *arg),
+    void *get_qlog_cb_arg);
 
 /*
  * Inform the TX packetiser that an EL has been discarded. Idempotent.
@@ -172,7 +172,7 @@ void ossl_quic_tx_packetiser_set_qlog_cb(OSSL_QUIC_TX_PACKETISER *txp,
  * free that QUIC_SSTREAM if desired.
  */
 int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp,
-                                              uint32_t enc_level);
+    uint32_t enc_level);
 
 /*
  * Informs the TX packetiser that the handshake is complete. The TX packetiser
@@ -187,14 +187,14 @@ void ossl_quic_tx_packetiser_schedule_handshake_done(OSSL_QUIC_TX_PACKETISER *tx
 
 /* Asks the TXP to ensure the next packet in the given PN space is ACK-eliciting. */
 void ossl_quic_tx_packetiser_schedule_ack_eliciting(OSSL_QUIC_TX_PACKETISER *txp,
-                                                    uint32_t pn_space);
+    uint32_t pn_space);
 
 /*
  * Asks the TXP to ensure an ACK is put in the next packet in the given PN
  * space.
  */
 void ossl_quic_tx_packetiser_schedule_ack(OSSL_QUIC_TX_PACKETISER *txp,
-                                          uint32_t pn_space);
+    uint32_t pn_space);
 
 /*
  * Schedules a connection close. *f and f->reason are copied. This operation is
@@ -204,31 +204,31 @@ void ossl_quic_tx_packetiser_schedule_ack(OSSL_QUIC_TX_PACKETISER *txp,
  * successful call to this function.
  */
 int ossl_quic_tx_packetiser_schedule_conn_close(OSSL_QUIC_TX_PACKETISER *txp,
-                                                const OSSL_QUIC_FRAME_CONN_CLOSE *f);
+    const OSSL_QUIC_FRAME_CONN_CLOSE *f);
 
 /* Setters for the msg_callback and msg_callback_arg */
 void ossl_quic_tx_packetiser_set_msg_callback(OSSL_QUIC_TX_PACKETISER *txp,
-                                              ossl_msg_cb msg_callback,
-                                              SSL *msg_callback_ssl);
+    ossl_msg_cb msg_callback,
+    SSL *msg_callback_ssl);
 void ossl_quic_tx_packetiser_set_msg_callback_arg(OSSL_QUIC_TX_PACKETISER *txp,
-                                                  void *msg_callback_arg);
+    void *msg_callback_arg);
 
 /*
  * Determines the next PN which will be used for a given PN space.
  */
 QUIC_PN ossl_quic_tx_packetiser_get_next_pn(OSSL_QUIC_TX_PACKETISER *txp,
-                                            uint32_t pn_space);
+    uint32_t pn_space);
 
 /*
  * Sets a callback which is called whenever TXP sends an ACK frame. The callee
  * must not modify the ACK frame data. Can be used to snoop on PNs being ACKed.
  */
 void ossl_quic_tx_packetiser_set_ack_tx_cb(OSSL_QUIC_TX_PACKETISER *txp,
-                                           void (*cb)(const OSSL_QUIC_FRAME_ACK *ack,
-                                                      uint32_t pn_space,
-                                                      void *arg),
-                                           void *cb_arg);
+    void (*cb)(const OSSL_QUIC_FRAME_ACK *ack,
+        uint32_t pn_space,
+        void *arg),
+    void *cb_arg);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_txpim.h b/include/internal/quic_txpim.h
index 5df6ad46cb30..d3f96807e21a 100644
--- a/include/internal/quic_txpim.h
+++ b/include/internal/quic_txpim.h
@@ -8,15 +8,15 @@
  */
 
 #ifndef OSSL_QUIC_TXPIM_H
-# define OSSL_QUIC_TXPIM_H
+#define OSSL_QUIC_TXPIM_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_types.h"
-# include "internal/quic_predef.h"
-# include "internal/quic_cfq.h"
-# include "internal/quic_ackm.h"
+#include <openssl/ssl.h>
+#include "internal/quic_types.h"
+#include "internal/quic_predef.h"
+#include "internal/quic_cfq.h"
+#include "internal/quic_ackm.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /*
  * QUIC Transmitted Packet Information Manager
@@ -25,24 +25,24 @@
 
 typedef struct quic_txpim_pkt_st {
     /* ACKM-specific data. Caller should fill this. */
-    OSSL_ACKM_TX_PKT    ackm_pkt;
+    OSSL_ACKM_TX_PKT ackm_pkt;
 
     /* Linked list of CFQ items in this packet. */
-    QUIC_CFQ_ITEM      *retx_head;
+    QUIC_CFQ_ITEM *retx_head;
 
     /* Reserved for FIFD use. */
-    QUIC_FIFD          *fifd;
+    QUIC_FIFD *fifd;
 
     /* QUIC_PKT_TYPE value. For diagnostic use only. */
-    unsigned char       pkt_type;
+    unsigned char pkt_type;
 
     /* Regenerate-strategy frames. */
-    unsigned int        had_handshake_done_frame    : 1;
-    unsigned int        had_max_data_frame          : 1;
-    unsigned int        had_max_streams_bidi_frame  : 1;
-    unsigned int        had_max_streams_uni_frame   : 1;
-    unsigned int        had_ack_frame               : 1;
-    unsigned int        had_conn_close              : 1;
+    unsigned int had_handshake_done_frame : 1;
+    unsigned int had_max_data_frame : 1;
+    unsigned int had_max_streams_bidi_frame : 1;
+    unsigned int had_max_streams_uni_frame : 1;
+    unsigned int had_ack_frame : 1;
+    unsigned int had_conn_close : 1;
 
     /* Private data follows. */
 } QUIC_TXPIM_PKT;
@@ -50,29 +50,29 @@ typedef struct quic_txpim_pkt_st {
 /* Represents a range of bytes in an application or CRYPTO stream. */
 typedef struct quic_txpim_chunk_st {
     /* The stream ID, or UINT64_MAX for the CRYPTO stream. */
-    uint64_t        stream_id;
+    uint64_t stream_id;
     /*
      * The inclusive range of bytes in the stream. Exceptionally, if end <
      * start, designates a frame of zero length (used for FIN-only frames). In
      * this case end is the number of the final byte (i.e., one less than the
      * final size of the stream).
      */
-    uint64_t        start, end;
+    uint64_t start, end;
     /*
      * Whether a FIN was sent for this stream in the packet. Not valid for
      * CRYPTO stream.
      */
-    unsigned int    has_fin : 1;
+    unsigned int has_fin : 1;
     /*
      * If set, a STOP_SENDING frame was sent for this stream ID. (If no data was
      * sent for the stream, set end < start.)
      */
-    unsigned int    has_stop_sending : 1;
+    unsigned int has_stop_sending : 1;
     /*
      * If set, a RESET_STREAM frame was sent for this stream ID. (If no data was
      * sent for the stream, set end < start.)
      */
-    unsigned int    has_reset_stream : 1;
+    unsigned int has_reset_stream : 1;
 } QUIC_TXPIM_CHUNK;
 
 QUIC_TXPIM *ossl_quic_txpim_new(void);
@@ -101,11 +101,11 @@ void ossl_quic_txpim_pkt_clear_chunks(QUIC_TXPIM_PKT *fpkt);
 
 /* Appends a chunk to the packet. The structure is copied. */
 int ossl_quic_txpim_pkt_append_chunk(QUIC_TXPIM_PKT *fpkt,
-                                     const QUIC_TXPIM_CHUNK *chunk);
+    const QUIC_TXPIM_CHUNK *chunk);
 
 /* Adds a CFQ item to the packet by prepending it to the retx_head list. */
 void ossl_quic_txpim_pkt_add_cfq_item(QUIC_TXPIM_PKT *fpkt,
-                                      QUIC_CFQ_ITEM *item);
+    QUIC_CFQ_ITEM *item);
 
 /*
  * Returns a pointer to an array of stream chunk information structures for the
@@ -130,6 +130,6 @@ size_t ossl_quic_txpim_pkt_get_num_chunks(const QUIC_TXPIM_PKT *fpkt);
  */
 size_t ossl_quic_txpim_get_in_use(const QUIC_TXPIM *txpim);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_types.h b/include/internal/quic_types.h
index 0913b370546f..8636912cd9ed 100644
--- a/include/internal/quic_types.h
+++ b/include/internal/quic_types.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OSSL_QUIC_TYPES_H
-# define OSSL_QUIC_TYPES_H
+#define OSSL_QUIC_TYPES_H
 
-# include <openssl/ssl.h>
-# include <internal/ssl.h>
-# include <assert.h>
-# include <string.h>
+#include <openssl/ssl.h>
+#include <internal/ssl.h>
+#include <assert.h>
+#include <string.h>
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /* QUIC encryption levels. */
 enum {
@@ -23,7 +23,7 @@ enum {
     QUIC_ENC_LEVEL_0RTT,
     QUIC_ENC_LEVEL_HANDSHAKE,
     QUIC_ENC_LEVEL_1RTT,
-    QUIC_ENC_LEVEL_NUM       /* Must be the ultimate entry */
+    QUIC_ENC_LEVEL_NUM /* Must be the ultimate entry */
 };
 
 /* QUIC packet number spaces. */
@@ -32,7 +32,7 @@ enum {
     QUIC_PN_SPACE_HANDSHAKE,
     /* New entries must go here, so that QUIC_PN_SPACE_APP is the penultimate */
     QUIC_PN_SPACE_APP,
-    QUIC_PN_SPACE_NUM       /* Must be the ultimate entry */
+    QUIC_PN_SPACE_NUM /* Must be the ultimate entry */
 };
 
 static ossl_unused ossl_inline uint32_t
@@ -54,7 +54,7 @@ ossl_quic_enc_level_to_pn_space(uint32_t enc_level)
 
 /* QUIC packet number representation. */
 typedef uint64_t QUIC_PN;
-#  define QUIC_PN_INVALID            UINT64_MAX
+#define QUIC_PN_INVALID UINT64_MAX
 
 static ossl_unused ossl_inline QUIC_PN ossl_quic_pn_max(QUIC_PN a, QUIC_PN b)
 {
@@ -72,15 +72,15 @@ static ossl_unused ossl_inline int ossl_quic_pn_valid(QUIC_PN pn)
 }
 
 /* QUIC connection ID representation. */
-#  define QUIC_MAX_CONN_ID_LEN   20
-#  define QUIC_MIN_ODCID_LEN     8   /* RFC 9000 s. 7.2 */
+#define QUIC_MAX_CONN_ID_LEN 20
+#define QUIC_MIN_ODCID_LEN 8 /* RFC 9000 s. 7.2 */
 
 typedef struct quic_conn_id_st {
     unsigned char id_len, id[QUIC_MAX_CONN_ID_LEN];
 } QUIC_CONN_ID;
 
 static ossl_unused ossl_inline int ossl_quic_conn_id_eq(const QUIC_CONN_ID *a,
-                                                        const QUIC_CONN_ID *b)
+    const QUIC_CONN_ID *b)
 {
     if (a->id_len != b->id_len || a->id_len > QUIC_MAX_CONN_ID_LEN)
         return 0;
@@ -92,21 +92,21 @@ static ossl_unused ossl_inline int ossl_quic_conn_id_eq(const QUIC_CONN_ID *a,
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_gen_rand_conn_id(OSSL_LIB_CTX *libctx, size_t len,
-                               QUIC_CONN_ID *cid);
+    QUIC_CONN_ID *cid);
 
-#  define QUIC_MIN_INITIAL_DGRAM_LEN  1200
+#define QUIC_MIN_INITIAL_DGRAM_LEN 1200
 
-#  define QUIC_DEFAULT_ACK_DELAY_EXP  3
-#  define QUIC_MAX_ACK_DELAY_EXP      20
+#define QUIC_DEFAULT_ACK_DELAY_EXP 3
+#define QUIC_MAX_ACK_DELAY_EXP 20
 
-#  define QUIC_DEFAULT_MAX_ACK_DELAY  25
+#define QUIC_DEFAULT_MAX_ACK_DELAY 25
 
-#  define QUIC_MIN_ACTIVE_CONN_ID_LIMIT   2
+#define QUIC_MIN_ACTIVE_CONN_ID_LIMIT 2
 
 /* Arbitrary choice of default idle timeout (not an RFC value). */
-#  define QUIC_DEFAULT_IDLE_TIMEOUT   30000
+#define QUIC_DEFAULT_IDLE_TIMEOUT 30000
 
-#  define QUIC_STATELESS_RESET_TOKEN_LEN    16
+#define QUIC_STATELESS_RESET_TOKEN_LEN 16
 
 typedef struct {
     unsigned char token[QUIC_STATELESS_RESET_TOKEN_LEN];
@@ -116,9 +116,9 @@ typedef struct {
  * An encoded preferred_addr transport parameter cannot be shorter or longer
  * than these lengths in bytes.
  */
-#  define QUIC_MIN_ENCODED_PREFERRED_ADDR_LEN   41
-#  define QUIC_MAX_ENCODED_PREFERRED_ADDR_LEN   61
+#define QUIC_MIN_ENCODED_PREFERRED_ADDR_LEN 41
+#define QUIC_MAX_ENCODED_PREFERRED_ADDR_LEN 61
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_vlint.h b/include/internal/quic_vlint.h
index d4b70b229c32..61012f6da7d1 100644
--- a/include/internal/quic_vlint.h
+++ b/include/internal/quic_vlint.h
@@ -1,19 +1,19 @@
 /*
-* Copyright 2022-2023 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2022-2023 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_VLINT_H
-# define OSSL_INTERNAL_QUIC_VLINT_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_VLINT_H
+#pragma once
 
-# include "internal/e_os.h"
+#include "internal/e_os.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
 /* The smallest value requiring a 1, 2, 4, or 8-byte representation. */
 #define OSSL_QUIC_VLINT_1B_MIN 0
@@ -28,7 +28,7 @@
 #define OSSL_QUIC_VLINT_8B_MAX (((uint64_t)1 << 62) - 1)
 
 /* The largest value representable as a variable-length integer. */
-#define OSSL_QUIC_VLINT_MAX    OSSL_QUIC_VLINT_8B_MAX
+#define OSSL_QUIC_VLINT_MAX OSSL_QUIC_VLINT_8B_MAX
 
 /*
  * Returns the number of bytes needed to encode v in the QUIC variable-length
@@ -122,6 +122,6 @@ uint64_t ossl_quic_vlint_decode_unchecked(const unsigned char *buf);
  */
 int ossl_quic_vlint_decode(const unsigned char *buf, size_t buf_len, uint64_t *v);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_wire.h b/include/internal/quic_wire.h
index cd01feb03628..f2efabaeba16 100644
--- a/include/internal/quic_wire.h
+++ b/include/internal/quic_wire.h
@@ -1,90 +1,78 @@
 /*
-* Copyright 2022-2023 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
-* in the file LICENSE in the source distribution or at
-* https://www.openssl.org/source/license.html
-*/
+ * Copyright 2022-2023 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
 #ifndef OSSL_INTERNAL_QUIC_WIRE_H
-# define OSSL_INTERNAL_QUIC_WIRE_H
-# pragma once
+#define OSSL_INTERNAL_QUIC_WIRE_H
+#pragma once
 
-# include "internal/e_os.h"
-# include "internal/time.h"
-# include "internal/quic_types.h"
-# include "internal/packet_quic.h"
+#include "internal/e_os.h"
+#include "internal/time.h"
+#include "internal/quic_types.h"
+#include "internal/packet_quic.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
-#  define OSSL_QUIC_FRAME_TYPE_PADDING                0x00
-#  define OSSL_QUIC_FRAME_TYPE_PING                   0x01
-#  define OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN        0x02
-#  define OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN           0x03
-#  define OSSL_QUIC_FRAME_TYPE_RESET_STREAM           0x04
-#  define OSSL_QUIC_FRAME_TYPE_STOP_SENDING           0x05
-#  define OSSL_QUIC_FRAME_TYPE_CRYPTO                 0x06
-#  define OSSL_QUIC_FRAME_TYPE_NEW_TOKEN              0x07
-#  define OSSL_QUIC_FRAME_TYPE_MAX_DATA               0x10
-#  define OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA        0x11
-#  define OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI       0x12
-#  define OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI        0x13
-#  define OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED           0x14
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED    0x15
-#  define OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI   0x16
-#  define OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI    0x17
-#  define OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID            0x18
-#  define OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID         0x19
-#  define OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE         0x1A
-#  define OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE          0x1B
-#  define OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT   0x1C
-#  define OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP         0x1D
-#  define OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE         0x1E
+#define OSSL_QUIC_FRAME_TYPE_PADDING 0x00
+#define OSSL_QUIC_FRAME_TYPE_PING 0x01
+#define OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN 0x02
+#define OSSL_QUIC_FRAME_TYPE_ACK_WITH_ECN 0x03
+#define OSSL_QUIC_FRAME_TYPE_RESET_STREAM 0x04
+#define OSSL_QUIC_FRAME_TYPE_STOP_SENDING 0x05
+#define OSSL_QUIC_FRAME_TYPE_CRYPTO 0x06
+#define OSSL_QUIC_FRAME_TYPE_NEW_TOKEN 0x07
+#define OSSL_QUIC_FRAME_TYPE_MAX_DATA 0x10
+#define OSSL_QUIC_FRAME_TYPE_MAX_STREAM_DATA 0x11
+#define OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI 0x12
+#define OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_UNI 0x13
+#define OSSL_QUIC_FRAME_TYPE_DATA_BLOCKED 0x14
+#define OSSL_QUIC_FRAME_TYPE_STREAM_DATA_BLOCKED 0x15
+#define OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI 0x16
+#define OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_UNI 0x17
+#define OSSL_QUIC_FRAME_TYPE_NEW_CONN_ID 0x18
+#define OSSL_QUIC_FRAME_TYPE_RETIRE_CONN_ID 0x19
+#define OSSL_QUIC_FRAME_TYPE_PATH_CHALLENGE 0x1A
+#define OSSL_QUIC_FRAME_TYPE_PATH_RESPONSE 0x1B
+#define OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT 0x1C
+#define OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_APP 0x1D
+#define OSSL_QUIC_FRAME_TYPE_HANDSHAKE_DONE 0x1E
 
-#  define OSSL_QUIC_FRAME_FLAG_STREAM_FIN         0x01
-#  define OSSL_QUIC_FRAME_FLAG_STREAM_LEN         0x02
-#  define OSSL_QUIC_FRAME_FLAG_STREAM_OFF         0x04
-#  define OSSL_QUIC_FRAME_FLAG_STREAM_MASK        ((uint64_t)0x07)
+#define OSSL_QUIC_FRAME_FLAG_STREAM_FIN 0x01
+#define OSSL_QUIC_FRAME_FLAG_STREAM_LEN 0x02
+#define OSSL_QUIC_FRAME_FLAG_STREAM_OFF 0x04
+#define OSSL_QUIC_FRAME_FLAG_STREAM_MASK ((uint64_t)0x07)
 
 /* Low 3 bits of the type contain flags */
-#  define OSSL_QUIC_FRAME_TYPE_STREAM             0x08             /* base ID */
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_FIN         \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_LEN         \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_LEN)
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_LEN_FIN     \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_LEN |            \
-     OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_OFF         \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_OFF)
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_OFF_FIN     \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_OFF |            \
-     OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN     \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_OFF |            \
-     OSSL_QUIC_FRAME_FLAG_STREAM_LEN)
-#  define OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN_FIN \
-    (OSSL_QUIC_FRAME_TYPE_STREAM |                \
-     OSSL_QUIC_FRAME_FLAG_STREAM_OFF |            \
-     OSSL_QUIC_FRAME_FLAG_STREAM_LEN |            \
-     OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
+#define OSSL_QUIC_FRAME_TYPE_STREAM 0x08 /* base ID */
+#define OSSL_QUIC_FRAME_TYPE_STREAM_FIN \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
+#define OSSL_QUIC_FRAME_TYPE_STREAM_LEN \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_LEN)
+#define OSSL_QUIC_FRAME_TYPE_STREAM_LEN_FIN \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_LEN | OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
+#define OSSL_QUIC_FRAME_TYPE_STREAM_OFF \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_OFF)
+#define OSSL_QUIC_FRAME_TYPE_STREAM_OFF_FIN \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_OFF | OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
+#define OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_OFF | OSSL_QUIC_FRAME_FLAG_STREAM_LEN)
+#define OSSL_QUIC_FRAME_TYPE_STREAM_OFF_LEN_FIN \
+    (OSSL_QUIC_FRAME_TYPE_STREAM | OSSL_QUIC_FRAME_FLAG_STREAM_OFF | OSSL_QUIC_FRAME_FLAG_STREAM_LEN | OSSL_QUIC_FRAME_FLAG_STREAM_FIN)
 
-#  define OSSL_QUIC_FRAME_TYPE_IS_STREAM(x) \
+#define OSSL_QUIC_FRAME_TYPE_IS_STREAM(x) \
     (((x) & ~OSSL_QUIC_FRAME_FLAG_STREAM_MASK) == OSSL_QUIC_FRAME_TYPE_STREAM)
-#  define OSSL_QUIC_FRAME_TYPE_IS_ACK(x) \
+#define OSSL_QUIC_FRAME_TYPE_IS_ACK(x) \
     (((x) & ~(uint64_t)1) == OSSL_QUIC_FRAME_TYPE_ACK_WITHOUT_ECN)
-#  define OSSL_QUIC_FRAME_TYPE_IS_MAX_STREAMS(x) \
+#define OSSL_QUIC_FRAME_TYPE_IS_MAX_STREAMS(x) \
     (((x) & ~(uint64_t)1) == OSSL_QUIC_FRAME_TYPE_MAX_STREAMS_BIDI)
-#  define OSSL_QUIC_FRAME_TYPE_IS_STREAMS_BLOCKED(x) \
+#define OSSL_QUIC_FRAME_TYPE_IS_STREAMS_BLOCKED(x) \
     (((x) & ~(uint64_t)1) == OSSL_QUIC_FRAME_TYPE_STREAMS_BLOCKED_BIDI)
-#  define OSSL_QUIC_FRAME_TYPE_IS_CONN_CLOSE(x) \
+#define OSSL_QUIC_FRAME_TYPE_IS_CONN_CLOSE(x) \
     (((x) & ~(uint64_t)1) == OSSL_QUIC_FRAME_TYPE_CONN_CLOSE_TRANSPORT)
 
 const char *ossl_quic_frame_type_to_string(uint64_t frame_type);
@@ -105,23 +93,23 @@ ossl_quic_frame_type_is_ack_eliciting(uint64_t frame_type)
 }
 
 /* QUIC Transport Parameter Types */
-#  define QUIC_TPARAM_ORIG_DCID                           0x00
-#  define QUIC_TPARAM_MAX_IDLE_TIMEOUT                    0x01
-#  define QUIC_TPARAM_STATELESS_RESET_TOKEN               0x02
-#  define QUIC_TPARAM_MAX_UDP_PAYLOAD_SIZE                0x03
-#  define QUIC_TPARAM_INITIAL_MAX_DATA                    0x04
-#  define QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL  0x05
-#  define QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE 0x06
-#  define QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_UNI         0x07
-#  define QUIC_TPARAM_INITIAL_MAX_STREAMS_BIDI            0x08
-#  define QUIC_TPARAM_INITIAL_MAX_STREAMS_UNI             0x09
-#  define QUIC_TPARAM_ACK_DELAY_EXP                       0x0A
-#  define QUIC_TPARAM_MAX_ACK_DELAY                       0x0B
-#  define QUIC_TPARAM_DISABLE_ACTIVE_MIGRATION            0x0C
-#  define QUIC_TPARAM_PREFERRED_ADDR                      0x0D
-#  define QUIC_TPARAM_ACTIVE_CONN_ID_LIMIT                0x0E
-#  define QUIC_TPARAM_INITIAL_SCID                        0x0F
-#  define QUIC_TPARAM_RETRY_SCID                          0x10
+#define QUIC_TPARAM_ORIG_DCID 0x00
+#define QUIC_TPARAM_MAX_IDLE_TIMEOUT 0x01
+#define QUIC_TPARAM_STATELESS_RESET_TOKEN 0x02
+#define QUIC_TPARAM_MAX_UDP_PAYLOAD_SIZE 0x03
+#define QUIC_TPARAM_INITIAL_MAX_DATA 0x04
+#define QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_BIDI_LOCAL 0x05
+#define QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_BIDI_REMOTE 0x06
+#define QUIC_TPARAM_INITIAL_MAX_STREAM_DATA_UNI 0x07
+#define QUIC_TPARAM_INITIAL_MAX_STREAMS_BIDI 0x08
+#define QUIC_TPARAM_INITIAL_MAX_STREAMS_UNI 0x09
+#define QUIC_TPARAM_ACK_DELAY_EXP 0x0A
+#define QUIC_TPARAM_MAX_ACK_DELAY 0x0B
+#define QUIC_TPARAM_DISABLE_ACTIVE_MIGRATION 0x0C
+#define QUIC_TPARAM_PREFERRED_ADDR 0x0D
+#define QUIC_TPARAM_ACTIVE_CONN_ID_LIMIT 0x0E
+#define QUIC_TPARAM_INITIAL_SCID 0x0F
+#define QUIC_TPARAM_RETRY_SCID 0x10
 
 /*
  * QUIC Frame Logical Representations
@@ -153,12 +141,12 @@ typedef struct ossl_quic_frame_ack_st {
      * num_ack_ranges must be greater than zero, as an ACK frame must
      * acknowledge at least one packet number.
      */
-    OSSL_QUIC_ACK_RANGE        *ack_ranges;
-    size_t                      num_ack_ranges;
+    OSSL_QUIC_ACK_RANGE *ack_ranges;
+    size_t num_ack_ranges;
 
-    OSSL_TIME                   delay_time;
-    uint64_t                    ect0, ect1, ecnce;
-    unsigned int                ecn_present : 1;
+    OSSL_TIME delay_time;
+    uint64_t ect0, ect1, ecnce;
+    unsigned int ecn_present : 1;
 } OSSL_QUIC_FRAME_ACK;
 
 /* Returns 1 if the given frame contains the given PN. */
@@ -166,10 +154,10 @@ int ossl_quic_frame_ack_contains_pn(const OSSL_QUIC_FRAME_ACK *ack, QUIC_PN pn);
 
 /* QUIC Frame: STREAM */
 typedef struct ossl_quic_frame_stream_st {
-    uint64_t                stream_id;  /* Stream ID */
-    uint64_t                offset;     /* Logical offset in stream */
-    uint64_t                len;        /* Length of data in bytes */
-    const unsigned char    *data;
+    uint64_t stream_id; /* Stream ID */
+    uint64_t offset; /* Logical offset in stream */
+    uint64_t len; /* Length of data in bytes */
+    const unsigned char *data;
 
     /*
      * On encode, this determines whether the len field should be encoded or
@@ -180,47 +168,47 @@ typedef struct ossl_quic_frame_stream_st {
      * length. If not set, the frame runs to the end of the packet and len has
      * been set accordingly.
      */
-    unsigned int            has_explicit_len : 1;
+    unsigned int has_explicit_len : 1;
 
     /* 1 if this is the end of the stream */
-    unsigned int            is_fin : 1;
+    unsigned int is_fin : 1;
 } OSSL_QUIC_FRAME_STREAM;
 
 /* QUIC Frame: CRYPTO */
 typedef struct ossl_quic_frame_crypto_st {
-    uint64_t                offset; /* Logical offset in stream */
-    uint64_t                len;    /* Length of the data in bytes */
-    const unsigned char    *data;
+    uint64_t offset; /* Logical offset in stream */
+    uint64_t len; /* Length of the data in bytes */
+    const unsigned char *data;
 } OSSL_QUIC_FRAME_CRYPTO;
 
 /* QUIC Frame: RESET_STREAM */
 typedef struct ossl_quic_frame_reset_stream_st {
-    uint64_t    stream_id;
-    uint64_t    app_error_code;
-    uint64_t    final_size;
+    uint64_t stream_id;
+    uint64_t app_error_code;
+    uint64_t final_size;
 } OSSL_QUIC_FRAME_RESET_STREAM;
 
 /* QUIC Frame: STOP_SENDING */
 typedef struct ossl_quic_frame_stop_sending_st {
-    uint64_t    stream_id;
-    uint64_t    app_error_code;
+    uint64_t stream_id;
+    uint64_t app_error_code;
 } OSSL_QUIC_FRAME_STOP_SENDING;
 
 /* QUIC Frame: NEW_CONNECTION_ID */
 typedef struct ossl_quic_frame_new_conn_id_st {
-    uint64_t                    seq_num;
-    uint64_t                    retire_prior_to;
-    QUIC_CONN_ID                conn_id;
-    QUIC_STATELESS_RESET_TOKEN  stateless_reset;
+    uint64_t seq_num;
+    uint64_t retire_prior_to;
+    QUIC_CONN_ID conn_id;
+    QUIC_STATELESS_RESET_TOKEN stateless_reset;
 } OSSL_QUIC_FRAME_NEW_CONN_ID;
 
 /* QUIC Frame: CONNECTION_CLOSE */
 typedef struct ossl_quic_frame_conn_close_st {
-    unsigned int    is_app : 1; /* 0: transport error, 1: app error */
-    uint64_t        error_code; /* 62-bit transport or app error code */
-    uint64_t        frame_type; /* transport errors only */
-    char            *reason;    /* UTF-8 string, not necessarily zero-terminated */
-    size_t          reason_len; /* Length of reason in bytes */
+    unsigned int is_app : 1; /* 0: transport error, 1: app error */
+    uint64_t error_code; /* 62-bit transport or app error code */
+    uint64_t frame_type; /* transport errors only */
+    char *reason; /* UTF-8 string, not necessarily zero-terminated */
+    size_t reason_len; /* Length of reason in bytes */
 } OSSL_QUIC_FRAME_CONN_CLOSE;
 
 /*
@@ -240,7 +228,7 @@ int ossl_quic_wire_encode_padding(WPACKET *pkt, size_t num_bytes);
 /*
  * Encodes a QUIC PING frame to the packet writer. This frame type takes
  * no arguments.
-*/
+ */
 int ossl_quic_wire_encode_frame_ping(WPACKET *pkt);
 
 /*
@@ -258,22 +246,22 @@ int ossl_quic_wire_encode_frame_ping(WPACKET *pkt);
  * the value used when decoding.
  */
 int ossl_quic_wire_encode_frame_ack(WPACKET *pkt,
-                                    uint32_t ack_delay_exponent,
-                                    const OSSL_QUIC_FRAME_ACK *ack);
+    uint32_t ack_delay_exponent,
+    const OSSL_QUIC_FRAME_ACK *ack);
 
 /*
  * Encodes a QUIC RESET_STREAM frame to the packet writer, given a logical
  * representation of the RESET_STREAM frame.
  */
 int ossl_quic_wire_encode_frame_reset_stream(WPACKET *pkt,
-                                             const OSSL_QUIC_FRAME_RESET_STREAM *f);
+    const OSSL_QUIC_FRAME_RESET_STREAM *f);
 
 /*
  * Encodes a QUIC STOP_SENDING frame to the packet writer, given a logical
  * representation of the STOP_SENDING frame.
  */
 int ossl_quic_wire_encode_frame_stop_sending(WPACKET *pkt,
-                                             const OSSL_QUIC_FRAME_STOP_SENDING *f);
+    const OSSL_QUIC_FRAME_STOP_SENDING *f);
 
 /*
  * Encodes a QUIC CRYPTO frame header to the packet writer.
@@ -282,7 +270,7 @@ int ossl_quic_wire_encode_frame_stop_sending(WPACKET *pkt,
  * immediately followed by f->len bytes of data.
  */
 int ossl_quic_wire_encode_frame_crypto_hdr(WPACKET *hdr,
-                                           const OSSL_QUIC_FRAME_CRYPTO *f);
+    const OSSL_QUIC_FRAME_CRYPTO *f);
 
 /*
  * Returns the number of bytes which will be required to encode the given
@@ -300,14 +288,14 @@ size_t ossl_quic_wire_get_encoded_frame_len_crypto_hdr(const OSSL_QUIC_FRAME_CRY
  * buffer. Returns NULL on failure.
  */
 void *ossl_quic_wire_encode_frame_crypto(WPACKET *pkt,
-                                         const OSSL_QUIC_FRAME_CRYPTO *f);
+    const OSSL_QUIC_FRAME_CRYPTO *f);
 
 /*
  * Encodes a QUIC NEW_TOKEN frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_new_token(WPACKET *pkt,
-                                          const unsigned char *token,
-                                          size_t token_len);
+    const unsigned char *token,
+    size_t token_len);
 
 /*
  * Encodes a QUIC STREAM frame's header to the packet writer. The f->stream_id,
@@ -325,7 +313,7 @@ int ossl_quic_wire_encode_frame_new_token(WPACKET *pkt,
  * immediately followed by f->len bytes of stream data.
  */
 int ossl_quic_wire_encode_frame_stream_hdr(WPACKET *pkt,
-                                           const OSSL_QUIC_FRAME_STREAM *f);
+    const OSSL_QUIC_FRAME_STREAM *f);
 
 /*
  * Returns the number of bytes which will be required to encode the given
@@ -345,20 +333,20 @@ size_t ossl_quic_wire_get_encoded_frame_len_stream_hdr(const OSSL_QUIC_FRAME_STR
  * must fill the returned buffer. Returns NULL on failure.
  */
 void *ossl_quic_wire_encode_frame_stream(WPACKET *pkt,
-                                         const OSSL_QUIC_FRAME_STREAM *f);
+    const OSSL_QUIC_FRAME_STREAM *f);
 
 /*
  * Encodes a QUIC MAX_DATA frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_max_data(WPACKET *pkt,
-                                         uint64_t max_data);
+    uint64_t max_data);
 
 /*
  * Encodes a QUIC MAX_STREAM_DATA frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_max_stream_data(WPACKET *pkt,
-                                                uint64_t stream_id,
-                                                uint64_t max_data);
+    uint64_t stream_id,
+    uint64_t max_data);
 
 /*
  * Encodes a QUIC MAX_STREAMS frame to the packet writer.
@@ -368,21 +356,21 @@ int ossl_quic_wire_encode_frame_max_stream_data(WPACKET *pkt,
  * streams.
  */
 int ossl_quic_wire_encode_frame_max_streams(WPACKET *pkt,
-                                            char     is_uni,
-                                            uint64_t max_streams);
+    char is_uni,
+    uint64_t max_streams);
 
 /*
  * Encodes a QUIC DATA_BLOCKED frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_data_blocked(WPACKET *pkt,
-                                             uint64_t max_data);
+    uint64_t max_data);
 
 /*
  * Encodes a QUIC STREAM_DATA_BLOCKED frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_stream_data_blocked(WPACKET *pkt,
-                                                    uint64_t stream_id,
-                                                    uint64_t max_stream_data);
+    uint64_t stream_id,
+    uint64_t max_stream_data);
 /*
  * Encodes a QUIC STREAMS_BLOCKED frame to the packet writer.
  *
@@ -391,8 +379,8 @@ int ossl_quic_wire_encode_frame_stream_data_blocked(WPACKET *pkt,
  * streams.
  */
 int ossl_quic_wire_encode_frame_streams_blocked(WPACKET *pkt,
-                                                char is_uni,
-                                                uint64_t max_streams);
+    char is_uni,
+    uint64_t max_streams);
 
 /*
  * Encodes a QUIC NEW_CONNECTION_ID frame to the packet writer, given a logical
@@ -402,25 +390,25 @@ int ossl_quic_wire_encode_frame_streams_blocked(WPACKET *pkt,
  * the call.
  */
 int ossl_quic_wire_encode_frame_new_conn_id(WPACKET *pkt,
-                                            const OSSL_QUIC_FRAME_NEW_CONN_ID *f);
+    const OSSL_QUIC_FRAME_NEW_CONN_ID *f);
 
 /*
  * Encodes a QUIC RETIRE_CONNECTION_ID frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_retire_conn_id(WPACKET *pkt,
-                                               uint64_t seq_num);
+    uint64_t seq_num);
 
 /*
  * Encodes a QUIC PATH_CHALLENGE frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_path_challenge(WPACKET *pkt,
-                                               uint64_t data);
+    uint64_t data);
 
 /*
  * Encodes a QUIC PATH_RESPONSE frame to the packet writer.
  */
 int ossl_quic_wire_encode_frame_path_response(WPACKET *pkt,
-                                              uint64_t data);
+    uint64_t data);
 
 /*
  * Encodes a QUIC CONNECTION_CLOSE frame to the packet writer, given a logical
@@ -432,7 +420,7 @@ int ossl_quic_wire_encode_frame_path_response(WPACKET *pkt,
  * reason string need not be zero terminated.
  */
 int ossl_quic_wire_encode_frame_conn_close(WPACKET *pkt,
-                                           const OSSL_QUIC_FRAME_CONN_CLOSE *f);
+    const OSSL_QUIC_FRAME_CONN_CLOSE *f);
 
 /*
  * Encodes a QUIC HANDSHAKE_DONE frame to the packet writer. This frame type
@@ -451,25 +439,25 @@ int ossl_quic_wire_encode_frame_handshake_done(WPACKET *pkt);
  * Returns a pointer to the start of the payload on success, or NULL on failure.
  */
 unsigned char *ossl_quic_wire_encode_transport_param_bytes(WPACKET *pkt,
-                                                           uint64_t id,
-                                                           const unsigned char *value,
-                                                           size_t value_len);
+    uint64_t id,
+    const unsigned char *value,
+    size_t value_len);
 
 /*
  * Encodes a QUIC transport parameter TLV with the given ID into the WPACKET.
  * The payload is a QUIC variable-length integer with the given value.
  */
 int ossl_quic_wire_encode_transport_param_int(WPACKET *pkt,
-                                              uint64_t id,
-                                              uint64_t value);
+    uint64_t id,
+    uint64_t value);
 
 /*
  * Encodes a QUIC transport parameter TLV with a given ID into the WPACKET.
  * The payload is a QUIC connection ID.
  */
 int ossl_quic_wire_encode_transport_param_cid(WPACKET *wpkt,
-                                              uint64_t id,
-                                              const QUIC_CONN_ID *cid);
+    uint64_t id,
+    const QUIC_CONN_ID *cid);
 
 /*
  * QUIC Wire Format Decoding
@@ -496,7 +484,7 @@ int ossl_quic_wire_encode_transport_param_cid(WPACKET *wpkt,
  * frame decoding function to call.
  */
 int ossl_quic_wire_peek_frame_header(PACKET *pkt, uint64_t *type,
-                                     int *was_minimal);
+    int *was_minimal);
 
 /*
  * Like ossl_quic_wire_peek_frame_header, but advances the current position
@@ -513,7 +501,7 @@ int ossl_quic_wire_skip_frame_header(PACKET *pkt, uint64_t *type);
  * The PACKET is not advanced.
  */
 int ossl_quic_wire_peek_frame_ack_num_ranges(const PACKET *pkt,
-                                             uint64_t *total_ranges);
+    uint64_t *total_ranges);
 
 /*
  * Decodes a QUIC ACK frame. The ack_ranges field of the passed structure should
@@ -543,21 +531,21 @@ int ossl_quic_wire_peek_frame_ack_num_ranges(const PACKET *pkt,
  * to encode the frame.
  */
 int ossl_quic_wire_decode_frame_ack(PACKET *pkt,
-                                    uint32_t ack_delay_exponent,
-                                    OSSL_QUIC_FRAME_ACK *ack,
-                                    uint64_t *total_ranges);
+    uint32_t ack_delay_exponent,
+    OSSL_QUIC_FRAME_ACK *ack,
+    uint64_t *total_ranges);
 
 /*
  * Decodes a QUIC RESET_STREAM frame.
  */
 int ossl_quic_wire_decode_frame_reset_stream(PACKET *pkt,
-                                             OSSL_QUIC_FRAME_RESET_STREAM *f);
+    OSSL_QUIC_FRAME_RESET_STREAM *f);
 
 /*
  * Decodes a QUIC STOP_SENDING frame.
  */
 int ossl_quic_wire_decode_frame_stop_sending(PACKET *pkt,
-                                             OSSL_QUIC_FRAME_STOP_SENDING *f);
+    OSSL_QUIC_FRAME_STOP_SENDING *f);
 
 /*
  * Decodes a QUIC CRYPTO frame.
@@ -568,15 +556,15 @@ int ossl_quic_wire_decode_frame_stop_sending(PACKET *pkt,
  * set to NULL.
  */
 int ossl_quic_wire_decode_frame_crypto(PACKET *pkt, int nodata,
-                                       OSSL_QUIC_FRAME_CRYPTO *f);
+    OSSL_QUIC_FRAME_CRYPTO *f);
 
 /*
  * Decodes a QUIC NEW_TOKEN frame. *token is written with a pointer to the token
  * bytes and *token_len is written with the length of the token in bytes.
  */
-int ossl_quic_wire_decode_frame_new_token(PACKET               *pkt,
-                                          const unsigned char **token,
-                                          size_t               *token_len);
+int ossl_quic_wire_decode_frame_new_token(PACKET *pkt,
+    const unsigned char **token,
+    size_t *token_len);
 
 /*
  * Decodes a QUIC STREAM frame.
@@ -608,22 +596,22 @@ int ossl_quic_wire_decode_frame_new_token(PACKET               *pkt,
  * stream.
  */
 int ossl_quic_wire_decode_frame_stream(PACKET *pkt, int nodata,
-                                       OSSL_QUIC_FRAME_STREAM *f);
+    OSSL_QUIC_FRAME_STREAM *f);
 
 /*
  * Decodes a QUIC MAX_DATA frame. The Maximum Data field is written to
  * *max_data.
  */
 int ossl_quic_wire_decode_frame_max_data(PACKET *pkt,
-                                         uint64_t *max_data);
+    uint64_t *max_data);
 
 /*
  * Decodes a QUIC MAX_STREAM_DATA frame. The Stream ID is written to *stream_id
  * and Maximum Stream Data field is written to *max_stream_data.
  */
 int ossl_quic_wire_decode_frame_max_stream_data(PACKET *pkt,
-                                                uint64_t *stream_id,
-                                          uint64_t *max_stream_data);
+    uint64_t *stream_id,
+    uint64_t *max_stream_data);
 /*
  * Decodes a QUIC MAX_STREAMS frame. The Maximum Streams field is written to
  * *max_streams.
@@ -633,22 +621,22 @@ int ossl_quic_wire_decode_frame_max_stream_data(PACKET *pkt,
  * determine this.
  */
 int ossl_quic_wire_decode_frame_max_streams(PACKET *pkt,
-                                            uint64_t *max_streams);
+    uint64_t *max_streams);
 
 /*
  * Decodes a QUIC DATA_BLOCKED frame. The Maximum Data field is written to
  * *max_data.
  */
 int ossl_quic_wire_decode_frame_data_blocked(PACKET *pkt,
-                                             uint64_t *max_data);
+    uint64_t *max_data);
 
 /*
  * Decodes a QUIC STREAM_DATA_BLOCKED frame. The Stream ID and Maximum Stream
  * Data fields are written to *stream_id and *max_stream_data respectively.
  */
 int ossl_quic_wire_decode_frame_stream_data_blocked(PACKET *pkt,
-                                                    uint64_t *stream_id,
-                                                    uint64_t *max_stream_data);
+    uint64_t *stream_id,
+    uint64_t *max_stream_data);
 
 /*
  * Decodes a QUIC STREAMS_BLOCKED frame. The Maximum Streams field is written to
@@ -659,8 +647,7 @@ int ossl_quic_wire_decode_frame_stream_data_blocked(PACKET *pkt,
  * determine this.
  */
 int ossl_quic_wire_decode_frame_streams_blocked(PACKET *pkt,
-                                                uint64_t *max_streams);
-
+    uint64_t *max_streams);
 
 /*
  * Decodes a QUIC NEW_CONNECTION_ID frame. The logical representation of the
@@ -672,26 +659,26 @@ int ossl_quic_wire_decode_frame_streams_blocked(PACKET *pkt,
  * in bytes.
  */
 int ossl_quic_wire_decode_frame_new_conn_id(PACKET *pkt,
-                                            OSSL_QUIC_FRAME_NEW_CONN_ID *f);
+    OSSL_QUIC_FRAME_NEW_CONN_ID *f);
 
 /*
  * Decodes a QUIC RETIRE_CONNECTION_ID frame. The Sequence Number field
  * is written to *seq_num.
  */
 int ossl_quic_wire_decode_frame_retire_conn_id(PACKET *pkt,
-                                               uint64_t *seq_num);
+    uint64_t *seq_num);
 
 /*
  * Decodes a QUIC PATH_CHALLENGE frame. The Data field is written to *data.
  */
 int ossl_quic_wire_decode_frame_path_challenge(PACKET *pkt,
-                                               uint64_t *data);
+    uint64_t *data);
 
 /*
  * Decodes a QUIC PATH_CHALLENGE frame. The Data field is written to *data.
  */
 int ossl_quic_wire_decode_frame_path_response(PACKET *pkt,
-                                              uint64_t *data);
+    uint64_t *data);
 
 /*
  * Decodes a QUIC CONNECTION_CLOSE frame. The logical representation
@@ -707,7 +694,7 @@ int ossl_quic_wire_decode_frame_path_response(PACKET *pkt,
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_wire_decode_frame_conn_close(PACKET *pkt,
-                                           OSSL_QUIC_FRAME_CONN_CLOSE *f);
+    OSSL_QUIC_FRAME_CONN_CLOSE *f);
 
 /*
  * Decodes one or more PADDING frames. PADDING frames have no arguments.
@@ -743,8 +730,8 @@ int ossl_quic_wire_peek_transport_param(PACKET *pkt, uint64_t *id);
  * Returns NULL on failure.
  */
 const unsigned char *ossl_quic_wire_decode_transport_param_bytes(PACKET *pkt,
-                                                                 uint64_t *id,
-                                                                 size_t *len);
+    uint64_t *id,
+    size_t *len);
 
 /*
  * Decodes a QUIC transport parameter TLV containing a variable-length integer.
@@ -753,8 +740,8 @@ const unsigned char *ossl_quic_wire_decode_transport_param_bytes(PACKET *pkt,
  * written to *value.
  */
 int ossl_quic_wire_decode_transport_param_int(PACKET *pkt,
-                                              uint64_t *id,
-                                              uint64_t *value);
+    uint64_t *id,
+    uint64_t *value);
 
 /*
  * Decodes a QUIC transport parameter TLV containing a connection ID.
@@ -763,22 +750,22 @@ int ossl_quic_wire_decode_transport_param_int(PACKET *pkt,
  * written to *value.
  */
 int ossl_quic_wire_decode_transport_param_cid(PACKET *pkt,
-                                              uint64_t *id,
-                                              QUIC_CONN_ID *cid);
+    uint64_t *id,
+    QUIC_CONN_ID *cid);
 
 /*
  * Decodes a QUIC transport parameter TLV containing a preferred_address.
  */
 typedef struct quic_preferred_addr_st {
-    uint16_t                    ipv4_port, ipv6_port;
-    unsigned char               ipv4[4], ipv6[16];
-    QUIC_STATELESS_RESET_TOKEN  stateless_reset;
-    QUIC_CONN_ID                cid;
+    uint16_t ipv4_port, ipv6_port;
+    unsigned char ipv4[4], ipv6[16];
+    QUIC_STATELESS_RESET_TOKEN stateless_reset;
+    QUIC_CONN_ID cid;
 } QUIC_PREFERRED_ADDR;
 
 int ossl_quic_wire_decode_transport_param_preferred_addr(PACKET *pkt,
-                                                         QUIC_PREFERRED_ADDR *p);
+    QUIC_PREFERRED_ADDR *p);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/quic_wire_pkt.h b/include/internal/quic_wire_pkt.h
index 8688253eaeef..657bad58b050 100644
--- a/include/internal/quic_wire_pkt.h
+++ b/include/internal/quic_wire_pkt.h
@@ -8,24 +8,24 @@
  */
 
 #ifndef OSSL_QUIC_WIRE_PKT_H
-# define OSSL_QUIC_WIRE_PKT_H
+#define OSSL_QUIC_WIRE_PKT_H
 
-# include <openssl/ssl.h>
-# include "internal/packet_quic.h"
-# include "internal/quic_types.h"
+#include <openssl/ssl.h>
+#include "internal/packet_quic.h"
+#include "internal/quic_types.h"
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
-#  define QUIC_VERSION_NONE   ((uint32_t)0)   /* Used for version negotiation */
-#  define QUIC_VERSION_1      ((uint32_t)1)   /* QUIC v1 */
+#define QUIC_VERSION_NONE ((uint32_t)0) /* Used for version negotiation */
+#define QUIC_VERSION_1 ((uint32_t)1) /* QUIC v1 */
 
 /* QUIC logical packet type. These do not match wire values. */
-#  define QUIC_PKT_TYPE_INITIAL        1
-#  define QUIC_PKT_TYPE_0RTT           2
-#  define QUIC_PKT_TYPE_HANDSHAKE      3
-#  define QUIC_PKT_TYPE_RETRY          4
-#  define QUIC_PKT_TYPE_1RTT           5
-#  define QUIC_PKT_TYPE_VERSION_NEG    6
+#define QUIC_PKT_TYPE_INITIAL 1
+#define QUIC_PKT_TYPE_0RTT 2
+#define QUIC_PKT_TYPE_HANDSHAKE 3
+#define QUIC_PKT_TYPE_RETRY 4
+#define QUIC_PKT_TYPE_1RTT 5
+#define QUIC_PKT_TYPE_VERSION_NEG 6
 
 /*
  * Determine encryption level from packet type. Returns QUIC_ENC_LEVEL_NUM if
@@ -35,16 +35,16 @@ static ossl_inline ossl_unused uint32_t
 ossl_quic_pkt_type_to_enc_level(uint32_t pkt_type)
 {
     switch (pkt_type) {
-        case QUIC_PKT_TYPE_INITIAL:
-            return QUIC_ENC_LEVEL_INITIAL;
-        case QUIC_PKT_TYPE_HANDSHAKE:
-            return QUIC_ENC_LEVEL_HANDSHAKE;
-        case QUIC_PKT_TYPE_0RTT:
-            return QUIC_ENC_LEVEL_0RTT;
-        case QUIC_PKT_TYPE_1RTT:
-            return QUIC_ENC_LEVEL_1RTT;
-        default:
-            return QUIC_ENC_LEVEL_NUM;
+    case QUIC_PKT_TYPE_INITIAL:
+        return QUIC_ENC_LEVEL_INITIAL;
+    case QUIC_PKT_TYPE_HANDSHAKE:
+        return QUIC_ENC_LEVEL_HANDSHAKE;
+    case QUIC_PKT_TYPE_0RTT:
+        return QUIC_ENC_LEVEL_0RTT;
+    case QUIC_PKT_TYPE_1RTT:
+        return QUIC_ENC_LEVEL_1RTT;
+    default:
+        return QUIC_ENC_LEVEL_NUM;
     }
 }
 
@@ -52,16 +52,16 @@ static ossl_inline ossl_unused uint32_t
 ossl_quic_enc_level_to_pkt_type(uint32_t enc_level)
 {
     switch (enc_level) {
-        case QUIC_ENC_LEVEL_INITIAL:
-            return QUIC_PKT_TYPE_INITIAL;
-        case QUIC_ENC_LEVEL_HANDSHAKE:
-            return QUIC_PKT_TYPE_HANDSHAKE;
-        case QUIC_ENC_LEVEL_0RTT:
-            return QUIC_PKT_TYPE_0RTT;
-        case QUIC_ENC_LEVEL_1RTT:
-            return QUIC_PKT_TYPE_1RTT;
-        default:
-            return UINT32_MAX;
+    case QUIC_ENC_LEVEL_INITIAL:
+        return QUIC_PKT_TYPE_INITIAL;
+    case QUIC_ENC_LEVEL_HANDSHAKE:
+        return QUIC_PKT_TYPE_HANDSHAKE;
+    case QUIC_ENC_LEVEL_0RTT:
+        return QUIC_PKT_TYPE_0RTT;
+    case QUIC_ENC_LEVEL_1RTT:
+        return QUIC_PKT_TYPE_1RTT;
+    default:
+        return UINT32_MAX;
     }
 }
 
@@ -70,11 +70,11 @@ static ossl_inline ossl_unused int
 ossl_quic_pkt_type_is_encrypted(uint32_t pkt_type)
 {
     switch (pkt_type) {
-        case QUIC_PKT_TYPE_RETRY:
-        case QUIC_PKT_TYPE_VERSION_NEG:
-            return 0;
-        default:
-            return 1;
+    case QUIC_PKT_TYPE_RETRY:
+    case QUIC_PKT_TYPE_VERSION_NEG:
+        return 0;
+    default:
+        return 1;
     }
 }
 
@@ -140,9 +140,9 @@ ossl_quic_pkt_type_has_scid(uint32_t pkt_type)
  * Smallest possible QUIC packet size as per RFC (aside from version negotiation
  * packets).
  */
-#  define QUIC_MIN_VALID_PKT_LEN_CRYPTO      21
-#  define QUIC_MIN_VALID_PKT_LEN_VERSION_NEG  7
-#  define QUIC_MIN_VALID_PKT_LEN              QUIC_MIN_VALID_PKT_LEN_VERSION_NEG
+#define QUIC_MIN_VALID_PKT_LEN_CRYPTO 21
+#define QUIC_MIN_VALID_PKT_LEN_VERSION_NEG 7
+#define QUIC_MIN_VALID_PKT_LEN QUIC_MIN_VALID_PKT_LEN_VERSION_NEG
 
 typedef struct quic_pkt_hdr_ptrs_st QUIC_PKT_HDR_PTRS;
 
@@ -155,16 +155,16 @@ typedef struct quic_pkt_hdr_ptrs_st QUIC_PKT_HDR_PTRS;
  * destroyed using ossl_quic_hdr_protector_cleanup when no longer needed.
  */
 typedef struct quic_hdr_protector_st {
-    OSSL_LIB_CTX       *libctx;
-    const char         *propq;
-    EVP_CIPHER_CTX     *cipher_ctx;
-    EVP_CIPHER         *cipher;
-    uint32_t            cipher_id;
+    OSSL_LIB_CTX *libctx;
+    const char *propq;
+    EVP_CIPHER_CTX *cipher_ctx;
+    EVP_CIPHER *cipher;
+    uint32_t cipher_id;
 } QUIC_HDR_PROTECTOR;
 
-#  define QUIC_HDR_PROT_CIPHER_AES_128    1
-#  define QUIC_HDR_PROT_CIPHER_AES_256    2
-#  define QUIC_HDR_PROT_CIPHER_CHACHA     3
+#define QUIC_HDR_PROT_CIPHER_AES_128 1
+#define QUIC_HDR_PROT_CIPHER_AES_256 2
+#define QUIC_HDR_PROT_CIPHER_CHACHA 3
 
 /*
  * Initialises a header protector.
@@ -186,11 +186,11 @@ typedef struct quic_hdr_protector_st {
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_hdr_protector_init(QUIC_HDR_PROTECTOR *hpr,
-                                 OSSL_LIB_CTX *libctx,
-                                 const char *propq,
-                                 uint32_t cipher_id,
-                                 const unsigned char *quic_hp_key,
-                                 size_t quic_hp_key_len);
+    OSSL_LIB_CTX *libctx,
+    const char *propq,
+    uint32_t cipher_id,
+    const unsigned char *quic_hp_key,
+    size_t quic_hp_key_len);
 
 /*
  * Destroys a header protector. This is also safe to call on a zero-initialized
@@ -212,7 +212,7 @@ void ossl_quic_hdr_protector_cleanup(QUIC_HDR_PROTECTOR *hpr);
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_hdr_protector_decrypt(QUIC_HDR_PROTECTOR *hpr,
-                                    QUIC_PKT_HDR_PTRS *ptrs);
+    QUIC_PKT_HDR_PTRS *ptrs);
 
 /*
  * Applies header protection to a packet. The packet payload must already have
@@ -225,7 +225,7 @@ int ossl_quic_hdr_protector_decrypt(QUIC_HDR_PROTECTOR *hpr,
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_hdr_protector_encrypt(QUIC_HDR_PROTECTOR *hpr,
-                                    QUIC_PKT_HDR_PTRS *ptrs);
+    QUIC_PKT_HDR_PTRS *ptrs);
 
 /*
  * Removes header protection from a packet. The packet payload must currently
@@ -248,20 +248,20 @@ int ossl_quic_hdr_protector_encrypt(QUIC_HDR_PROTECTOR *hpr,
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_hdr_protector_decrypt_fields(QUIC_HDR_PROTECTOR *hpr,
-                                           const unsigned char *sample,
-                                           size_t sample_len,
-                                           unsigned char *first_byte,
-                                           unsigned char *pn_bytes);
+    const unsigned char *sample,
+    size_t sample_len,
+    unsigned char *first_byte,
+    unsigned char *pn_bytes);
 
 /*
  * Works analogously to ossl_hdr_protector_decrypt_fields, but applies header
  * protection instead of removing it.
  */
 int ossl_quic_hdr_protector_encrypt_fields(QUIC_HDR_PROTECTOR *hpr,
-                                           const unsigned char *sample,
-                                           size_t sample_len,
-                                           unsigned char *first_byte,
-                                           unsigned char *pn_bytes);
+    const unsigned char *sample,
+    size_t sample_len,
+    unsigned char *first_byte,
+    unsigned char *pn_bytes);
 
 /*
  * QUIC Packet Header
@@ -310,29 +310,29 @@ int ossl_quic_hdr_protector_encrypt_fields(QUIC_HDR_PROTECTOR *hpr,
  */
 typedef struct quic_pkt_hdr_st {
     /* [ALL] A QUIC_PKT_TYPE_* value. Always valid. */
-    unsigned int    type        :8;
+    unsigned int type : 8;
 
     /* [S] Value of the spin bit. Valid if (type == 1RTT). */
-    unsigned int    spin_bit    :1;
+    unsigned int spin_bit : 1;
 
     /*
      * [S] Value of the Key Phase bit in the short packet.
      * Valid if (type == 1RTT && !partial).
      */
-    unsigned int    key_phase   :1;
+    unsigned int key_phase : 1;
 
     /*
      * [1i0h] Length of packet number in bytes. This is the decoded value.
      * Valid if ((type == 1RTT || (version && type != RETRY)) && !partial).
      */
-    unsigned int    pn_len      :4;
+    unsigned int pn_len : 4;
 
     /*
      * [ALL] Set to 1 if this is a partial decode because the packet header
      * has not yet been deprotected. pn_len, pn and key_phase are not valid if
      * this is set.
      */
-    unsigned int    partial     :1;
+    unsigned int partial : 1;
 
     /*
      * [ALL] Whether the fixed bit was set. Note that only Version Negotiation
@@ -340,7 +340,7 @@ typedef struct quic_pkt_hdr_st {
      * other packet types (decode will fail if it is not set). Ignored when
      * encoding unless encoding a Version Negotiation packet.
      */
-    unsigned int    fixed       :1;
+    unsigned int fixed : 1;
 
     /*
      * The unused bits in the low 4 bits of a Retry packet header's first byte.
@@ -348,7 +348,7 @@ typedef struct quic_pkt_hdr_st {
      * representation in their header when decoding and encoding them again.
      * This is necessary to validate Retry packet headers.
      */
-    unsigned int    unused      :4;
+    unsigned int unused : 4;
 
     /*
      * The 'Reserved' bits in an Initial, Handshake, 0-RTT or 1-RTT packet
@@ -356,19 +356,19 @@ typedef struct quic_pkt_hdr_st {
      * that they are zero, as this must be done after packet protection is
      * successfully removed to avoid creating a timing channel.
      */
-    unsigned int    reserved    :2;
+    unsigned int reserved : 2;
 
     /* [L] Version field. Valid if (type != 1RTT). */
-    uint32_t        version;
+    uint32_t version;
 
     /* [ALL] The destination connection ID. Always valid. */
-    QUIC_CONN_ID    dst_conn_id;
+    QUIC_CONN_ID dst_conn_id;
 
     /*
      * [L] The source connection ID.
      * Valid if (type != 1RTT).
      */
-    QUIC_CONN_ID    src_conn_id;
+    QUIC_CONN_ID src_conn_id;
 
     /*
      * [1i0h] Relatively-encoded packet number in raw, encoded form. The correct
@@ -378,7 +378,7 @@ typedef struct quic_pkt_hdr_st {
      *
      * Valid if ((type == 1RTT || (version && type != RETRY)) && !partial).
      */
-    unsigned char           pn[4];
+    unsigned char pn[4];
 
     /*
      * [i] Token field in Initial packet. Points to memory inside the decoded
@@ -387,8 +387,8 @@ typedef struct quic_pkt_hdr_st {
      *
      * Valid if (type == INITIAL).
      */
-    const unsigned char    *token;
-    size_t                  token_len;
+    const unsigned char *token;
+    size_t token_len;
 
     /*
      * [ALL] Payload length in bytes.
@@ -399,7 +399,7 @@ typedef struct quic_pkt_hdr_st {
      * length, regardless of whether the packet type encoded or decoded uses an
      * explicit length indication.
      */
-    size_t                  len;
+    size_t len;
 
     /*
      * Pointer to start of payload data in the packet. Points to memory inside
@@ -424,7 +424,7 @@ typedef struct quic_pkt_hdr_st {
      * this case (i.e., the len field is the number of payload bytes plus the
      * number of bytes comprising the PN).
      */
-    const unsigned char    *data;
+    const unsigned char *data;
 } QUIC_PKT_HDR;
 
 /*
@@ -433,15 +433,15 @@ typedef struct quic_pkt_hdr_st {
  * needing to partially re-decode the packet header.
  */
 struct quic_pkt_hdr_ptrs_st {
-    unsigned char    *raw_start;        /* start of packet */
-    unsigned char    *raw_sample;       /* start of sampling range */
-    size_t            raw_sample_len;   /* maximum length of sampling range */
+    unsigned char *raw_start; /* start of packet */
+    unsigned char *raw_sample; /* start of sampling range */
+    size_t raw_sample_len; /* maximum length of sampling range */
 
     /*
      * Start of PN field. Guaranteed to be NULL unless at least four bytes are
      * available via this pointer.
      */
-    unsigned char    *raw_pn;
+    unsigned char *raw_pn;
 };
 
 /*
@@ -472,16 +472,16 @@ struct quic_pkt_hdr_ptrs_st {
  * Returns 1 on success and 0 on failure.
  */
 
-#  define QUIC_PKT_HDR_DECODE_DECODE_ERR  (1 << 0)
-#  define QUIC_PKT_HDR_DECODE_BAD_VERSION (1 << 1)
+#define QUIC_PKT_HDR_DECODE_DECODE_ERR (1 << 0)
+#define QUIC_PKT_HDR_DECODE_BAD_VERSION (1 << 1)
 
 int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
-                                  size_t short_conn_id_len,
-                                  int partial,
-                                  int nodata,
-                                  QUIC_PKT_HDR *hdr,
-                                  QUIC_PKT_HDR_PTRS *ptrs,
-                                  uint64_t *fail_cause);
+    size_t short_conn_id_len,
+    int partial,
+    int nodata,
+    QUIC_PKT_HDR *hdr,
+    QUIC_PKT_HDR_PTRS *ptrs,
+    uint64_t *fail_cause);
 
 /*
  * Encodes a packet header. The packet is written to pkt.
@@ -519,9 +519,9 @@ int ossl_quic_wire_decode_pkt_hdr(PACKET *pkt,
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
-                                  size_t short_conn_id_len,
-                                  const QUIC_PKT_HDR *hdr,
-                                  QUIC_PKT_HDR_PTRS *ptrs);
+    size_t short_conn_id_len,
+    const QUIC_PKT_HDR *hdr,
+    QUIC_PKT_HDR_PTRS *ptrs);
 
 /*
  * Retrieves only the DCID from a packet header. This is intended for demuxer
@@ -534,9 +534,9 @@ int ossl_quic_wire_encode_pkt_hdr(WPACKET *pkt,
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_wire_get_pkt_hdr_dst_conn_id(const unsigned char *buf,
-                                           size_t buf_len,
-                                           size_t short_conn_id_len,
-                                           QUIC_CONN_ID *dst_conn_id);
+    size_t buf_len,
+    size_t short_conn_id_len,
+    QUIC_CONN_ID *dst_conn_id);
 
 /*
  * Precisely predicts the encoded length of a packet header structure.
@@ -546,7 +546,7 @@ int ossl_quic_wire_get_pkt_hdr_dst_conn_id(const unsigned char *buf,
  * ossl_quic_wire_encode_pkt_hdr() will succeed.
  */
 int ossl_quic_wire_get_encoded_pkt_hdr_len(size_t short_conn_id_len,
-                                           const QUIC_PKT_HDR *hdr);
+    const QUIC_PKT_HDR *hdr);
 
 /*
  * Packet Number Encoding
@@ -565,9 +565,9 @@ int ossl_quic_wire_get_encoded_pkt_hdr_len(size_t short_conn_id_len,
  * Returns 1 on success or 0 on failure.
  */
 int ossl_quic_wire_decode_pkt_hdr_pn(const unsigned char *enc_pn,
-                                     size_t enc_pn_len,
-                                     QUIC_PN largest_pn,
-                                     QUIC_PN *res_pn);
+    size_t enc_pn_len,
+    QUIC_PN largest_pn,
+    QUIC_PN *res_pn);
 
 /*
  * Determine how many bytes should be used to encode a PN. Returns the number of
@@ -584,15 +584,15 @@ int ossl_quic_wire_determine_pn_len(QUIC_PN pn, QUIC_PN largest_acked);
  * Returns 1 on success and 0 on failure.
  */
 int ossl_quic_wire_encode_pkt_hdr_pn(QUIC_PN pn,
-                                     unsigned char *enc_pn,
-                                     size_t enc_pn_len);
+    unsigned char *enc_pn,
+    size_t enc_pn_len);
 
 /*
  * Retry Integrity Tags
  * ====================
  */
 
-#  define QUIC_RETRY_INTEGRITY_TAG_LEN    16
+#define QUIC_RETRY_INTEGRITY_TAG_LEN 16
 
 /*
  * Validate a retry integrity tag. Returns 1 if the tag is valid.
@@ -607,9 +607,9 @@ int ossl_quic_wire_encode_pkt_hdr_pn(QUIC_PN pn,
  * the body is too short.
  */
 int ossl_quic_validate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
-                                           const char *propq,
-                                           const QUIC_PKT_HDR *hdr,
-                                           const QUIC_CONN_ID *client_initial_dcid);
+    const char *propq,
+    const QUIC_PKT_HDR *hdr,
+    const QUIC_CONN_ID *client_initial_dcid);
 
 /*
  * Calculates a retry integrity tag. Returns 0 on error, for example if hdr does
@@ -628,11 +628,11 @@ int ossl_quic_validate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
  * Retry Integrity Tag.
  */
 int ossl_quic_calculate_retry_integrity_tag(OSSL_LIB_CTX *libctx,
-                                            const char *propq,
-                                            const QUIC_PKT_HDR *hdr,
-                                            const QUIC_CONN_ID *client_initial_dcid,
-                                            unsigned char *tag);
+    const char *propq,
+    const QUIC_PKT_HDR *hdr,
+    const QUIC_CONN_ID *client_initial_dcid,
+    unsigned char *tag);
 
-# endif
+#endif
 
 #endif
diff --git a/include/internal/rcu.h b/include/internal/rcu.h
index 90160e8da71d..a89794c0c8ad 100644
--- a/include/internal/rcu.h
+++ b/include/internal/rcu.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OPENSSL_RCU_H
-# define OPENSSL_RCU_H
-# pragma once
+#define OPENSSL_RCU_H
+#pragma once
 
 #include "crypto/context.h"
 
@@ -28,6 +28,6 @@ int ossl_rcu_call(CRYPTO_RCU_LOCK *lock, rcu_cb_fn cb, void *data);
 void *ossl_rcu_uptr_deref(void **p);
 void ossl_rcu_assign_uptr(void **p, void **v);
 #define ossl_rcu_deref(p) ossl_rcu_uptr_deref((void **)p)
-#define ossl_rcu_assign_ptr(p,v) ossl_rcu_assign_uptr((void **)p, (void **)v)
+#define ossl_rcu_assign_ptr(p, v) ossl_rcu_assign_uptr((void **)p, (void **)v)
 
 #endif
diff --git a/include/internal/recordmethod.h b/include/internal/recordmethod.h
index b36c74c7f3b7..eedded636c2f 100644
--- a/include/internal/recordmethod.h
+++ b/include/internal/recordmethod.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OSSL_INTERNAL_RECORDMETHOD_H
-# define OSSL_INTERNAL_RECORDMETHOD_H
-# pragma once
+#define OSSL_INTERNAL_RECORDMETHOD_H
+#pragma once
 
-# include <openssl/ssl.h>
+#include <openssl/ssl.h>
 
 /*
  * We use the term "record" here to refer to a packet of data. Records are
@@ -36,18 +36,17 @@ typedef struct ossl_record_method_st OSSL_RECORD_METHOD;
  */
 typedef struct ossl_record_layer_st OSSL_RECORD_LAYER;
 
+#define OSSL_RECORD_ROLE_CLIENT 0
+#define OSSL_RECORD_ROLE_SERVER 1
 
-# define OSSL_RECORD_ROLE_CLIENT 0
-# define OSSL_RECORD_ROLE_SERVER 1
+#define OSSL_RECORD_DIRECTION_READ 0
+#define OSSL_RECORD_DIRECTION_WRITE 1
 
-# define OSSL_RECORD_DIRECTION_READ  0
-# define OSSL_RECORD_DIRECTION_WRITE 1
-
-# define OSSL_RECORD_RETURN_SUCCESS           1
-# define OSSL_RECORD_RETURN_RETRY             0
-# define OSSL_RECORD_RETURN_NON_FATAL_ERR    -1
-# define OSSL_RECORD_RETURN_FATAL            -2
-# define OSSL_RECORD_RETURN_EOF              -3
+#define OSSL_RECORD_RETURN_SUCCESS 1
+#define OSSL_RECORD_RETURN_RETRY 0
+#define OSSL_RECORD_RETURN_NON_FATAL_ERR -1
+#define OSSL_RECORD_RETURN_FATAL -2
+#define OSSL_RECORD_RETURN_EOF -3
 
 /*
  * Template for creating a record. A record consists of the |type| of data it
@@ -112,35 +111,35 @@ struct ossl_record_method_st {
      * now though, this works.
      */
     int (*new_record_layer)(OSSL_LIB_CTX *libctx,
-                            const char *propq, int vers,
-                            int role, int direction,
-                            int level,
-                            uint16_t epoch,
-                            unsigned char *secret,
-                            size_t secretlen,
-                            unsigned char *key,
-                            size_t keylen,
-                            unsigned char *iv,
-                            size_t ivlen,
-                            unsigned char *mackey,
-                            size_t mackeylen,
-                            const EVP_CIPHER *ciph,
-                            size_t taglen,
-                            int mactype,
-                            const EVP_MD *md,
-                            COMP_METHOD *comp,
-                            const EVP_MD *kdfdigest,
-                            BIO *prev,
-                            BIO *transport,
-                            BIO *next,
-                            BIO_ADDR *local,
-                            BIO_ADDR *peer,
-                            const OSSL_PARAM *settings,
-                            const OSSL_PARAM *options,
-                            const OSSL_DISPATCH *fns,
-                            void *cbarg,
-                            void *rlarg,
-                            OSSL_RECORD_LAYER **ret);
+        const char *propq, int vers,
+        int role, int direction,
+        int level,
+        uint16_t epoch,
+        unsigned char *secret,
+        size_t secretlen,
+        unsigned char *key,
+        size_t keylen,
+        unsigned char *iv,
+        size_t ivlen,
+        unsigned char *mackey,
+        size_t mackeylen,
+        const EVP_CIPHER *ciph,
+        size_t taglen,
+        int mactype,
+        const EVP_MD *md,
+        COMP_METHOD *comp,
+        const EVP_MD *kdfdigest,
+        BIO *prev,
+        BIO *transport,
+        BIO *next,
+        BIO_ADDR *local,
+        BIO_ADDR *peer,
+        const OSSL_PARAM *settings,
+        const OSSL_PARAM *options,
+        const OSSL_DISPATCH *fns,
+        void *cbarg,
+        void *rlarg,
+        OSSL_RECORD_LAYER **ret);
     int (*free)(OSSL_RECORD_LAYER *rl);
 
     /* Returns 1 if we have unprocessed data buffered or 0 otherwise */
@@ -172,7 +171,7 @@ struct ossl_record_method_st {
      * be used. This must always be less than or equal to |maxfrag|.
      */
     size_t (*get_max_records)(OSSL_RECORD_LAYER *rl, uint8_t type, size_t len,
-                              size_t maxfrag, size_t *preffrag);
+        size_t maxfrag, size_t *preffrag);
 
     /*
      * Write |numtempl| records from the array of record templates pointed to
@@ -195,7 +194,7 @@ struct ossl_record_method_st {
      * -1 on failure
      */
     int (*write_records)(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates,
-                         size_t numtempl);
+        size_t numtempl);
 
     /*
      * Retry a previous call to write_records. The caller should continue to
@@ -224,8 +223,8 @@ struct ossl_record_method_st {
      * multiple records in one go and buffer them.
      */
     int (*read_record)(OSSL_RECORD_LAYER *rl, void **rechandle, int *rversion,
-                      uint8_t *type, const unsigned char **data, size_t *datalen,
-                      uint16_t *epoch, unsigned char *seq_num);
+        uint8_t *type, const unsigned char **data, size_t *datalen,
+        uint16_t *epoch, unsigned char *seq_num);
     /*
      * Release length bytes from a buffer associated with a record previously
      * read with read_record. Once all the bytes from a record are released, the
@@ -279,7 +278,7 @@ struct ossl_record_method_st {
      * Get a short or long human readable description of the record layer state
      */
     void (*get_state)(OSSL_RECORD_LAYER *rl, const char **shortstr,
-                      const char **longstr);
+        const char **longstr);
 
     /*
      * Set new options or modify ones that were originally specified in the
@@ -320,12 +319,11 @@ struct ossl_record_method_st {
     int (*free_buffers)(OSSL_RECORD_LAYER *rl);
 };
 
-
 /* Standard built-in record methods */
 extern const OSSL_RECORD_METHOD ossl_tls_record_method;
-# ifndef OPENSSL_NO_KTLS
+#ifndef OPENSSL_NO_KTLS
 extern const OSSL_RECORD_METHOD ossl_ktls_record_method;
-# endif
+#endif
 extern const OSSL_RECORD_METHOD ossl_dtls_record_method;
 
 #endif /* !defined(OSSL_INTERNAL_RECORDMETHOD_H) */
diff --git a/include/internal/refcount.h b/include/internal/refcount.h
index 8de230f343ac..61eb78ae4120 100644
--- a/include/internal/refcount.h
+++ b/include/internal/refcount.h
@@ -7,30 +7,30 @@
  * 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/err.h>
+#include <openssl/e_os2.h>
+#include <openssl/trace.h>
+#include <openssl/err.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
 
-#   if defined(__has_feature)
-#    if __has_feature(thread_sanitizer)
-#     define OSSL_TSAN_BUILD
-#    endif
-#   endif
+#if defined(__has_feature)
+#if __has_feature(thread_sanitizer)
+#define OSSL_TSAN_BUILD
+#endif
+#endif
 
 typedef struct {
     _Atomic int val;
@@ -54,17 +54,17 @@ static inline int CRYPTO_UP_REF(CRYPTO_REF_COUNT *refcnt, int *ret)
  */
 static inline int CRYPTO_DOWN_REF(CRYPTO_REF_COUNT *refcnt, int *ret)
 {
-#   ifdef OSSL_TSAN_BUILD
+#ifdef OSSL_TSAN_BUILD
     /*
      * TSAN requires acq_rel as it indicates a false positive error when
      * the object that contains the refcount is freed otherwise.
      */
     *ret = atomic_fetch_sub_explicit(&refcnt->val, 1, memory_order_acq_rel) - 1;
-#   else
+#else
     *ret = atomic_fetch_sub_explicit(&refcnt->val, 1, memory_order_release) - 1;
     if (*ret == 0)
         atomic_thread_fence(memory_order_acquire);
-#   endif
+#endif
     return 1;
 }
 
@@ -74,9 +74,9 @@ static inline int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt, 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 struct {
     int val;
@@ -102,8 +102,8 @@ static __inline__ int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt, int *ret)
     return 1;
 }
 
-#  elif defined(__ICL) && defined(_WIN32)
-#   define HAVE_ATOMICS 1
+#elif defined(__ICL) && defined(_WIN32)
+#define HAVE_ATOMICS 1
 
 typedef struct {
     volatile int val;
@@ -127,19 +127,19 @@ static __inline int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt, int *ret)
     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 struct {
     volatile int val;
 } 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(CRYPTO_REF_COUNT *refcnt, int *ret)
 {
@@ -159,18 +159,18 @@ static __inline int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt, int *ret)
     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(CRYPTO_REF_COUNT *refcnt, int *ret)
 {
@@ -190,46 +190,46 @@ static __inline int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt, int *ret)
     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 struct {
     int val;
-#  ifdef OPENSSL_THREADS
+#ifdef OPENSSL_THREADS
     CRYPTO_RWLOCK *lock;
-#  endif
+#endif
 } CRYPTO_REF_COUNT;
 
-#  ifdef OPENSSL_THREADS
+#ifdef OPENSSL_THREADS
 
 static ossl_unused ossl_inline int CRYPTO_UP_REF(CRYPTO_REF_COUNT *refcnt,
-                                                 int *ret)
+    int *ret)
 {
     return CRYPTO_atomic_add(&refcnt->val, 1, ret, refcnt->lock);
 }
 
 static ossl_unused ossl_inline int CRYPTO_DOWN_REF(CRYPTO_REF_COUNT *refcnt,
-                                                   int *ret)
+    int *ret)
 {
     return CRYPTO_atomic_add(&refcnt->val, -1, ret, refcnt->lock);
 }
 
 static ossl_unused ossl_inline int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt,
-                                                   int *ret)
+    int *ret)
 {
     return CRYPTO_atomic_load_int(&refcnt->val, ret, refcnt->lock);
 }
 
-#   define CRYPTO_NEW_FREE_DEFINED  1
+#define CRYPTO_NEW_FREE_DEFINED 1
 static ossl_unused ossl_inline int CRYPTO_NEW_REF(CRYPTO_REF_COUNT *refcnt, int n)
 {
     refcnt->val = n;
@@ -241,16 +241,16 @@ static ossl_unused ossl_inline int CRYPTO_NEW_REF(CRYPTO_REF_COUNT *refcnt, int
     return 1;
 }
 
-static ossl_unused ossl_inline void CRYPTO_FREE_REF(CRYPTO_REF_COUNT *refcnt)                                  \
+static ossl_unused ossl_inline void CRYPTO_FREE_REF(CRYPTO_REF_COUNT *refcnt)
 {
     if (refcnt != NULL)
         CRYPTO_THREAD_lock_free(refcnt->lock);
 }
 
-#  else     /* OPENSSL_THREADS */
+#else /* OPENSSL_THREADS */
 
 static ossl_unused ossl_inline int CRYPTO_UP_REF(CRYPTO_REF_COUNT *refcnt,
-                                                 int *ret)
+    int *ret)
 {
     refcnt->val++;
     *ret = refcnt->val;
@@ -258,7 +258,7 @@ static ossl_unused ossl_inline int CRYPTO_UP_REF(CRYPTO_REF_COUNT *refcnt,
 }
 
 static ossl_unused ossl_inline int CRYPTO_DOWN_REF(CRYPTO_REF_COUNT *refcnt,
-                                                   int *ret)
+    int *ret)
 {
     refcnt->val--;
     *ret = refcnt->val;
@@ -266,38 +266,38 @@ static ossl_unused ossl_inline int CRYPTO_DOWN_REF(CRYPTO_REF_COUNT *refcnt,
 }
 
 static ossl_unused ossl_inline int CRYPTO_GET_REF(CRYPTO_REF_COUNT *refcnt,
-                                                   int *ret)
+    int *ret)
 {
     *ret = refcnt->val;
     return 1;
 }
 
-#  endif    /* OPENSSL_THREADS */
-# endif
+#endif /* OPENSSL_THREADS */
+#endif
 
-# ifndef CRYPTO_NEW_FREE_DEFINED
+#ifndef CRYPTO_NEW_FREE_DEFINED
 static ossl_unused ossl_inline int CRYPTO_NEW_REF(CRYPTO_REF_COUNT *refcnt, int n)
 {
     refcnt->val = n;
     return 1;
 }
 
-static ossl_unused ossl_inline void CRYPTO_FREE_REF(CRYPTO_REF_COUNT *refcnt)                                  \
+static ossl_unused ossl_inline void CRYPTO_FREE_REF(CRYPTO_REF_COUNT *refcnt)
 {
 }
-# endif /* CRYPTO_NEW_FREE_DEFINED */
+#endif /* CRYPTO_NEW_FREE_DEFINED */
 #undef CRYPTO_NEW_FREE_DEFINED
 
-# 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, val, object) \
+#define REF_PRINT_COUNT(text, val, object) \
     REF_PRINT_EX(text, val, (void *)object)
 
 #endif
diff --git a/include/internal/ring_buf.h b/include/internal/ring_buf.h
index 436f1ca14628..cc70bfaeac9a 100644
--- a/include/internal/ring_buf.h
+++ b/include/internal/ring_buf.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_INTERNAL_RING_BUF_H
-# define OSSL_INTERNAL_RING_BUF_H
-# pragma once
+#define OSSL_INTERNAL_RING_BUF_H
+#pragma once
 
-# include <openssl/e_os2.h>              /* For 'ossl_inline' */
-# include "internal/safe_math.h"
+#include <openssl/e_os2.h> /* For 'ossl_inline' */
+#include "internal/safe_math.h"
 
 /*
  * ==================================================================
@@ -23,26 +23,26 @@
  * but not yet culled will not be overwritten, and can be restored.
  */
 struct ring_buf {
-    void       *start;
-    size_t      alloc;        /* size of buffer allocation in bytes */
+    void *start;
+    size_t alloc; /* size of buffer allocation in bytes */
 
     /*
      * Logical offset of the head (where we append to). This is the current size
      * of the QUIC stream. This increases monotonically.
      */
-    uint64_t    head_offset;
+    uint64_t head_offset;
 
     /*
      * Logical offset of the cull tail. Data is no longer needed and is
      * deallocated as the cull tail advances, which occurs as data is
      * acknowledged. This increases monotonically.
      */
-    uint64_t    ctail_offset;
+    uint64_t ctail_offset;
 };
 
 OSSL_SAFE_MATH_UNSIGNED(u64, uint64_t)
 
-#define MAX_OFFSET   (((uint64_t)1) << 62) /* QUIC-imposed limit */
+#define MAX_OFFSET (((uint64_t)1) << 62) /* QUIC-imposed limit */
 
 static ossl_inline int ring_buf_init(struct ring_buf *r)
 {
@@ -73,9 +73,9 @@ static ossl_inline size_t ring_buf_avail(struct ring_buf *r)
 }
 
 static ossl_inline int ring_buf_write_at(struct ring_buf *r,
-                                         uint64_t logical_offset,
-                                         const unsigned char *buf,
-                                         size_t buf_len)
+    uint64_t logical_offset,
+    const unsigned char *buf,
+    size_t buf_len)
 {
     size_t avail, idx, l;
     unsigned char *start = r->start;
@@ -84,9 +84,9 @@ static ossl_inline int ring_buf_write_at(struct ring_buf *r,
     avail = ring_buf_avail(r);
     if (logical_offset < r->ctail_offset
         || safe_add_u64(logical_offset, buf_len, &err)
-           > safe_add_u64(r->head_offset, avail, &err)
+            > safe_add_u64(r->head_offset, avail, &err)
         || safe_add_u64(r->head_offset, buf_len, &err)
-           > MAX_OFFSET
+            > MAX_OFFSET
         || err)
         return 0;
 
@@ -111,8 +111,8 @@ static ossl_inline int ring_buf_write_at(struct ring_buf *r,
 }
 
 static ossl_inline size_t ring_buf_push(struct ring_buf *r,
-                                        const unsigned char *buf,
-                                        size_t buf_len)
+    const unsigned char *buf,
+    size_t buf_len)
 {
     size_t pushed = 0, avail, idx, l;
     unsigned char *start = r->start;
@@ -134,18 +134,18 @@ static ossl_inline size_t ring_buf_push(struct ring_buf *r,
             l = buf_len;
 
         memcpy(start + idx, buf, l);
-        r->head_offset  += l;
-        buf             += l;
-        buf_len         -= l;
-        pushed          += l;
+        r->head_offset += l;
+        buf += l;
+        buf_len -= l;
+        pushed += l;
     }
 
     return pushed;
 }
 
 static ossl_inline const unsigned char *ring_buf_get_ptr(const struct ring_buf *r,
-                                                         uint64_t logical_offset,
-                                                         size_t *max_len)
+    uint64_t logical_offset,
+    size_t *max_len)
 {
     unsigned char *start = r->start;
     size_t idx;
@@ -170,9 +170,9 @@ static ossl_inline const unsigned char *ring_buf_get_ptr(const struct ring_buf *
  * The ring buffer state is not changed.
  */
 static ossl_inline int ring_buf_get_buf_at(const struct ring_buf *r,
-                                           uint64_t logical_offset,
-                                           const unsigned char **buf,
-                                           size_t *buf_len)
+    uint64_t logical_offset,
+    const unsigned char **buf,
+    size_t *buf_len)
 {
     const unsigned char *start = r->start;
     size_t idx, l;
@@ -181,24 +181,24 @@ static ossl_inline int ring_buf_get_buf_at(const struct ring_buf *r,
         return 0;
 
     if (r->alloc == 0) {
-        *buf        = NULL;
-        *buf_len    = 0;
+        *buf = NULL;
+        *buf_len = 0;
         return 1;
     }
 
     idx = logical_offset % r->alloc;
-    l   = (size_t)(r->head_offset - logical_offset);
+    l = (size_t)(r->head_offset - logical_offset);
     if (l > r->alloc - idx)
         l = r->alloc - idx;
 
-    *buf        = start + idx;
-    *buf_len    = l;
+    *buf = start + idx;
+    *buf_len = l;
     return 1;
 }
 
 static ossl_inline void ring_buf_cpop_range(struct ring_buf *r,
-                                            uint64_t start, uint64_t end,
-                                            int cleanse)
+    uint64_t start, uint64_t end,
+    int cleanse)
 {
     assert(end >= start);
 
@@ -229,9 +229,9 @@ static ossl_inline void ring_buf_cpop_range(struct ring_buf *r,
 }
 
 static ossl_inline int ring_buf_resize(struct ring_buf *r, size_t num_bytes,
-                                       int cleanse)
+    int cleanse)
 {
-    struct ring_buf rnew = {0};
+    struct ring_buf rnew = { 0 };
     const unsigned char *src = NULL;
     size_t src_len = 0, copied = 0;
 
@@ -245,9 +245,9 @@ static ossl_inline int ring_buf_resize(struct ring_buf *r, size_t num_bytes,
     if (rnew.start == NULL)
         return 0;
 
-    rnew.alloc          = num_bytes;
-    rnew.head_offset    = r->head_offset - ring_buf_used(r);
-    rnew.ctail_offset   = rnew.head_offset;
+    rnew.alloc = num_bytes;
+    rnew.head_offset = r->head_offset - ring_buf_used(r);
+    rnew.ctail_offset = rnew.head_offset;
 
     for (;;) {
         if (!ring_buf_get_buf_at(r, r->ctail_offset + copied, &src, &src_len)) {
@@ -274,4 +274,4 @@ static ossl_inline int ring_buf_resize(struct ring_buf *r, size_t num_bytes,
     return 1;
 }
 
-#endif                          /* OSSL_INTERNAL_RING_BUF_H */
+#endif /* OSSL_INTERNAL_RING_BUF_H */
diff --git a/include/internal/rio_notifier.h b/include/internal/rio_notifier.h
index ec2035714f75..794fccf40a68 100644
--- a/include/internal/rio_notifier.h
+++ b/include/internal/rio_notifier.h
@@ -7,10 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_RIO_NOTIFIER_H
-# define OSSL_RIO_NOTIFIER_H
+#define OSSL_RIO_NOTIFIER_H
 
-# include "internal/common.h"
-# include "internal/sockets.h"
+#include "internal/common.h"
+#include "internal/sockets.h"
 
 /*
  * Pollable Notifier
@@ -20,18 +20,18 @@
  * OS's socket polling APIs to allow socket polling calls to be woken
  * artificially by other threads.
  */
-# define RIO_NOTIFIER_METHOD_SOCKET      1
-# define RIO_NOTIFIER_METHOD_SOCKETPAIR  2
+#define RIO_NOTIFIER_METHOD_SOCKET 1
+#define RIO_NOTIFIER_METHOD_SOCKETPAIR 2
 
-# if !defined(RIO_NOTIFIER_METHOD)
-#  if defined(OPENSSL_SYS_WINDOWS)
-#   define RIO_NOTIFIER_METHOD          RIO_NOTIFIER_METHOD_SOCKET
-#  elif defined(OPENSSL_SYS_UNIX)
-#   define RIO_NOTIFIER_METHOD          RIO_NOTIFIER_METHOD_SOCKETPAIR
-#  else
-#   define RIO_NOTIFIER_METHOD          RIO_NOTIFIER_METHOD_SOCKET
-#  endif
-# endif
+#if !defined(RIO_NOTIFIER_METHOD)
+#if defined(OPENSSL_SYS_WINDOWS)
+#define RIO_NOTIFIER_METHOD RIO_NOTIFIER_METHOD_SOCKET
+#elif defined(OPENSSL_SYS_UNIX)
+#define RIO_NOTIFIER_METHOD RIO_NOTIFIER_METHOD_SOCKETPAIR
+#else
+#define RIO_NOTIFIER_METHOD RIO_NOTIFIER_METHOD_SOCKET
+#endif
+#endif
 
 typedef struct rio_notifier_st {
     int rfd, wfd;
diff --git a/include/internal/safe_math.h b/include/internal/safe_math.h
index ecfb281f40aa..dda5cc48f011 100644
--- a/include/internal/safe_math.h
+++ b/include/internal/safe_math.h
@@ -8,290 +8,290 @@
  */
 
 #ifndef OSSL_INTERNAL_SAFE_MATH_H
-# define OSSL_INTERNAL_SAFE_MATH_H
-# pragma once
+#define OSSL_INTERNAL_SAFE_MATH_H
+#pragma once
 
-# include <openssl/e_os2.h>              /* For 'ossl_inline' */
+#include <openssl/e_os2.h> /* For 'ossl_inline' */
 
-# ifndef OPENSSL_NO_BUILTIN_OVERFLOW_CHECKING
-#  ifdef __has_builtin
-#   define has(func) __has_builtin(func)
-#  elif defined(__GNUC__)
-#   if __GNUC__ > 5
-#    define has(func) 1
-#   endif
-#  endif
-# endif /* OPENSSL_NO_BUILTIN_OVERFLOW_CHECKING */
+#ifndef OPENSSL_NO_BUILTIN_OVERFLOW_CHECKING
+#ifdef __has_builtin
+#define has(func) __has_builtin(func)
+#elif defined(__GNUC__)
+#if __GNUC__ > 5
+#define has(func) 1
+#endif
+#endif
+#endif /* OPENSSL_NO_BUILTIN_OVERFLOW_CHECKING */
 
-# ifndef has
-#  define has(func) 0
-# endif
+#ifndef has
+#define has(func) 0
+#endif
 
 /*
  * Safe addition helpers
  */
-# if has(__builtin_add_overflow)
-#  define OSSL_SAFE_MATH_ADDS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_add_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        type r;                                                              \
-                                                                             \
-        if (!__builtin_add_overflow(a, b, &r))                               \
-            return r;                                                        \
-        *err |= 1;                                                           \
-        return a < 0 ? min : max;                                            \
+#if has(__builtin_add_overflow)
+#define OSSL_SAFE_MATH_ADDS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_add_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        type r;                                                      \
+                                                                     \
+        if (!__builtin_add_overflow(a, b, &r))                       \
+            return r;                                                \
+        *err |= 1;                                                   \
+        return a < 0 ? min : max;                                    \
     }
 
-#  define OSSL_SAFE_MATH_ADDU(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_add_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        type r;                                                              \
-                                                                             \
-        if (!__builtin_add_overflow(a, b, &r))                               \
-            return r;                                                        \
-        *err |= 1;                                                           \
-        return a + b;                                                            \
+#define OSSL_SAFE_MATH_ADDU(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_add_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        type r;                                                      \
+                                                                     \
+        if (!__builtin_add_overflow(a, b, &r))                       \
+            return r;                                                \
+        *err |= 1;                                                   \
+        return a + b;                                                \
     }
 
-# else  /* has(__builtin_add_overflow) */
-#  define OSSL_SAFE_MATH_ADDS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_add_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if ((a < 0) ^ (b < 0)                                                \
-                || (a > 0 && b <= max - a)                                   \
-                || (a < 0 && b >= min - a)                                   \
-                || a == 0)                                                   \
-            return a + b;                                                    \
-        *err |= 1;                                                           \
-        return a < 0 ? min : max;                                            \
+#else /* has(__builtin_add_overflow) */
+#define OSSL_SAFE_MATH_ADDS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_add_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if ((a < 0) ^ (b < 0)                                        \
+            || (a > 0 && b <= max - a)                               \
+            || (a < 0 && b >= min - a)                               \
+            || a == 0)                                               \
+            return a + b;                                            \
+        *err |= 1;                                                   \
+        return a < 0 ? min : max;                                    \
     }
 
-#  define OSSL_SAFE_MATH_ADDU(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_add_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b > max - a)                                                     \
-            *err |= 1;                                                       \
-        return a + b;                                                        \
+#define OSSL_SAFE_MATH_ADDU(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_add_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b > max - a)                                             \
+            *err |= 1;                                               \
+        return a + b;                                                \
     }
-# endif /* has(__builtin_add_overflow) */
+#endif /* has(__builtin_add_overflow) */
 
 /*
  * Safe subtraction helpers
  */
-# if has(__builtin_sub_overflow)
-#  define OSSL_SAFE_MATH_SUBS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_sub_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        type r;                                                              \
-                                                                             \
-        if (!__builtin_sub_overflow(a, b, &r))                               \
-            return r;                                                        \
-        *err |= 1;                                                           \
-        return a < 0 ? min : max;                                            \
+#if has(__builtin_sub_overflow)
+#define OSSL_SAFE_MATH_SUBS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_sub_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        type r;                                                      \
+                                                                     \
+        if (!__builtin_sub_overflow(a, b, &r))                       \
+            return r;                                                \
+        *err |= 1;                                                   \
+        return a < 0 ? min : max;                                    \
     }
 
-# else  /* has(__builtin_sub_overflow) */
-#  define OSSL_SAFE_MATH_SUBS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_sub_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (!((a < 0) ^ (b < 0))                                             \
-                || (b > 0 && a >= min + b)                                   \
-                || (b < 0 && a <= max + b)                                   \
-                || b == 0)                                                   \
-            return a - b;                                                    \
-        *err |= 1;                                                           \
-        return a < 0 ? min : max;                                            \
+#else /* has(__builtin_sub_overflow) */
+#define OSSL_SAFE_MATH_SUBS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_sub_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (!((a < 0) ^ (b < 0))                                     \
+            || (b > 0 && a >= min + b)                               \
+            || (b < 0 && a <= max + b)                               \
+            || b == 0)                                               \
+            return a - b;                                            \
+        *err |= 1;                                                   \
+        return a < 0 ? min : max;                                    \
     }
 
-# endif /* has(__builtin_sub_overflow) */
+#endif /* has(__builtin_sub_overflow) */
 
-# define OSSL_SAFE_MATH_SUBU(type_name, type) \
-    static ossl_inline ossl_unused type safe_sub_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b > a)                                                           \
-            *err |= 1;                                                       \
-        return a - b;                                                        \
+#define OSSL_SAFE_MATH_SUBU(type_name, type)                         \
+    static ossl_inline ossl_unused type safe_sub_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b > a)                                                   \
+            *err |= 1;                                               \
+        return a - b;                                                \
     }
 
 /*
  * Safe multiplication helpers
  */
-# if has(__builtin_mul_overflow)
-#  define OSSL_SAFE_MATH_MULS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_mul_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        type r;                                                              \
-                                                                             \
-        if (!__builtin_mul_overflow(a, b, &r))                               \
-            return r;                                                        \
-        *err |= 1;                                                           \
-        return (a < 0) ^ (b < 0) ? min : max;                                \
+#if has(__builtin_mul_overflow)
+#define OSSL_SAFE_MATH_MULS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_mul_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        type r;                                                      \
+                                                                     \
+        if (!__builtin_mul_overflow(a, b, &r))                       \
+            return r;                                                \
+        *err |= 1;                                                   \
+        return (a < 0) ^ (b < 0) ? min : max;                        \
     }
 
-#  define OSSL_SAFE_MATH_MULU(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_mul_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        type r;                                                              \
-                                                                             \
-        if (!__builtin_mul_overflow(a, b, &r))                               \
-            return r;                                                        \
-        *err |= 1;                                                           \
-        return a * b;                                                          \
+#define OSSL_SAFE_MATH_MULU(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_mul_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        type r;                                                      \
+                                                                     \
+        if (!__builtin_mul_overflow(a, b, &r))                       \
+            return r;                                                \
+        *err |= 1;                                                   \
+        return a * b;                                                \
     }
 
-# else  /* has(__builtin_mul_overflow) */
-#  define OSSL_SAFE_MATH_MULS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_mul_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (a == 0 || b == 0)                                                \
-            return 0;                                                        \
-        if (a == 1)                                                          \
-            return b;                                                        \
-        if (b == 1)                                                          \
-            return a;                                                        \
-        if (a != min && b != min) {                                          \
-            const type x = a < 0 ? -a : a;                                   \
-            const type y = b < 0 ? -b : b;                                   \
-                                                                             \
-            if (x <= max / y)                                                \
-                return a * b;                                                \
-        }                                                                    \
-        *err |= 1;                                                           \
-        return (a < 0) ^ (b < 0) ? min : max;                                \
+#else /* has(__builtin_mul_overflow) */
+#define OSSL_SAFE_MATH_MULS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_mul_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (a == 0 || b == 0)                                        \
+            return 0;                                                \
+        if (a == 1)                                                  \
+            return b;                                                \
+        if (b == 1)                                                  \
+            return a;                                                \
+        if (a != min && b != min) {                                  \
+            const type x = a < 0 ? -a : a;                           \
+            const type y = b < 0 ? -b : b;                           \
+                                                                     \
+            if (x <= max / y)                                        \
+                return a * b;                                        \
+        }                                                            \
+        *err |= 1;                                                   \
+        return (a < 0) ^ (b < 0) ? min : max;                        \
     }
 
-#  define OSSL_SAFE_MATH_MULU(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_mul_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b != 0 && a > max / b)                                           \
-            *err |= 1;                                                       \
-        return a * b;                                                        \
+#define OSSL_SAFE_MATH_MULU(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_mul_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b != 0 && a > max / b)                                   \
+            *err |= 1;                                               \
+        return a * b;                                                \
     }
-# endif /* has(__builtin_mul_overflow) */
+#endif /* has(__builtin_mul_overflow) */
 
 /*
  * Safe division helpers
  */
-# define OSSL_SAFE_MATH_DIVS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_div_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b == 0) {                                                        \
-            *err |= 1;                                                       \
-            return a < 0 ? min : max;                                        \
-        }                                                                    \
-        if (b == -1 && a == min) {                                           \
-            *err |= 1;                                                       \
-            return max;                                                      \
-        }                                                                    \
-        return a / b;                                                        \
+#define OSSL_SAFE_MATH_DIVS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_div_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b == 0) {                                                \
+            *err |= 1;                                               \
+            return a < 0 ? min : max;                                \
+        }                                                            \
+        if (b == -1 && a == min) {                                   \
+            *err |= 1;                                               \
+            return max;                                              \
+        }                                                            \
+        return a / b;                                                \
     }
 
-# define OSSL_SAFE_MATH_DIVU(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_div_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b != 0)                                                          \
-            return a / b;                                                    \
-        *err |= 1;                                                           \
-        return max;                                                        \
+#define OSSL_SAFE_MATH_DIVU(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_div_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b != 0)                                                  \
+            return a / b;                                            \
+        *err |= 1;                                                   \
+        return max;                                                  \
     }
 
 /*
  * Safe modulus helpers
  */
-# define OSSL_SAFE_MATH_MODS(type_name, type, min, max) \
-    static ossl_inline ossl_unused type safe_mod_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b == 0) {                                                        \
-            *err |= 1;                                                       \
-            return 0;                                                        \
-        }                                                                    \
-        if (b == -1 && a == min) {                                           \
-            *err |= 1;                                                       \
-            return max;                                                      \
-        }                                                                    \
-        return a % b;                                                        \
+#define OSSL_SAFE_MATH_MODS(type_name, type, min, max)               \
+    static ossl_inline ossl_unused type safe_mod_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b == 0) {                                                \
+            *err |= 1;                                               \
+            return 0;                                                \
+        }                                                            \
+        if (b == -1 && a == min) {                                   \
+            *err |= 1;                                               \
+            return max;                                              \
+        }                                                            \
+        return a % b;                                                \
     }
 
-# define OSSL_SAFE_MATH_MODU(type_name, type) \
-    static ossl_inline ossl_unused type safe_mod_ ## type_name(type a,       \
-                                                               type b,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (b != 0)                                                          \
-            return a % b;                                                    \
-        *err |= 1;                                                           \
-        return 0;                                                            \
+#define OSSL_SAFE_MATH_MODU(type_name, type)                         \
+    static ossl_inline ossl_unused type safe_mod_##type_name(type a, \
+        type b,                                                      \
+        int *err)                                                    \
+    {                                                                \
+        if (b != 0)                                                  \
+            return a % b;                                            \
+        *err |= 1;                                                   \
+        return 0;                                                    \
     }
 
 /*
  * Safe negation helpers
  */
-# define OSSL_SAFE_MATH_NEGS(type_name, type, min) \
-    static ossl_inline ossl_unused type safe_neg_ ## type_name(type a,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (a != min)                                                        \
-            return -a;                                                       \
-        *err |= 1;                                                           \
-        return min;                                                          \
+#define OSSL_SAFE_MATH_NEGS(type_name, type, min)                    \
+    static ossl_inline ossl_unused type safe_neg_##type_name(type a, \
+        int *err)                                                    \
+    {                                                                \
+        if (a != min)                                                \
+            return -a;                                               \
+        *err |= 1;                                                   \
+        return min;                                                  \
     }
 
-# define OSSL_SAFE_MATH_NEGU(type_name, type) \
-    static ossl_inline ossl_unused type safe_neg_ ## type_name(type a,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (a == 0)                                                          \
-            return a;                                                        \
-        *err |= 1;                                                           \
-        return 1 + ~a;                                                       \
+#define OSSL_SAFE_MATH_NEGU(type_name, type)                         \
+    static ossl_inline ossl_unused type safe_neg_##type_name(type a, \
+        int *err)                                                    \
+    {                                                                \
+        if (a == 0)                                                  \
+            return a;                                                \
+        *err |= 1;                                                   \
+        return 1 + ~a;                                               \
     }
 
 /*
  * Safe absolute value helpers
  */
-# define OSSL_SAFE_MATH_ABSS(type_name, type, min) \
-    static ossl_inline ossl_unused type safe_abs_ ## type_name(type a,       \
-                                                               int *err)     \
-    {                                                                        \
-        if (a != min)                                                        \
-            return a < 0 ? -a : a;                                           \
-        *err |= 1;                                                           \
-        return min;                                                          \
+#define OSSL_SAFE_MATH_ABSS(type_name, type, min)                    \
+    static ossl_inline ossl_unused type safe_abs_##type_name(type a, \
+        int *err)                                                    \
+    {                                                                \
+        if (a != min)                                                \
+            return a < 0 ? -a : a;                                   \
+        *err |= 1;                                                   \
+        return min;                                                  \
     }
 
-# define OSSL_SAFE_MATH_ABSU(type_name, type) \
-    static ossl_inline ossl_unused type safe_abs_ ## type_name(type a,       \
-                                                               int *err)     \
-    {                                                                        \
-        return a;                                                            \
+#define OSSL_SAFE_MATH_ABSU(type_name, type)                         \
+    static ossl_inline ossl_unused type safe_abs_##type_name(type a, \
+        int *err)                                                    \
+    {                                                                \
+        return a;                                                    \
     }
 
 /*
@@ -316,59 +316,59 @@
  *
  * The algorithm used is not perfect but it should be "good enough".
  */
-# define OSSL_SAFE_MATH_MULDIVS(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_muldiv_ ## type_name(type a,    \
-                                                                  type b,    \
-                                                                  type c,    \
-                                                                  int *err)  \
-    {                                                                        \
-        int e2 = 0;                                                          \
-        type q, r, x, y;                                                     \
-                                                                             \
-        if (c == 0) {                                                        \
-            *err |= 1;                                                       \
-            return a == 0 || b == 0 ? 0 : max;                               \
-        }                                                                    \
-        x = safe_mul_ ## type_name(a, b, &e2);                               \
-        if (!e2)                                                             \
-            return safe_div_ ## type_name(x, c, err);                        \
-        if (b > a) {                                                         \
-            x = b;                                                           \
-            b = a;                                                           \
-            a = x;                                                           \
-        }                                                                    \
-        q = safe_div_ ## type_name(a, c, err);                               \
-        r = safe_mod_ ## type_name(a, c, err);                               \
-        x = safe_mul_ ## type_name(r, b, err);                               \
-        y = safe_mul_ ## type_name(q, b, err);                               \
-        q = safe_div_ ## type_name(x, c, err);                               \
-        return safe_add_ ## type_name(y, q, err);                            \
+#define OSSL_SAFE_MATH_MULDIVS(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_muldiv_##type_name(type a, \
+        type b,                                                         \
+        type c,                                                         \
+        int *err)                                                       \
+    {                                                                   \
+        int e2 = 0;                                                     \
+        type q, r, x, y;                                                \
+                                                                        \
+        if (c == 0) {                                                   \
+            *err |= 1;                                                  \
+            return a == 0 || b == 0 ? 0 : max;                          \
+        }                                                               \
+        x = safe_mul_##type_name(a, b, &e2);                            \
+        if (!e2)                                                        \
+            return safe_div_##type_name(x, c, err);                     \
+        if (b > a) {                                                    \
+            x = b;                                                      \
+            b = a;                                                      \
+            a = x;                                                      \
+        }                                                               \
+        q = safe_div_##type_name(a, c, err);                            \
+        r = safe_mod_##type_name(a, c, err);                            \
+        x = safe_mul_##type_name(r, b, err);                            \
+        y = safe_mul_##type_name(q, b, err);                            \
+        q = safe_div_##type_name(x, c, err);                            \
+        return safe_add_##type_name(y, q, err);                         \
     }
 
-# define OSSL_SAFE_MATH_MULDIVU(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_muldiv_ ## type_name(type a,    \
-                                                                  type b,    \
-                                                                  type c,    \
-                                                                  int *err)  \
-    {                                                                        \
-        int e2 = 0;                                                          \
-        type x, y;                                                           \
-                                                                             \
-        if (c == 0) {                                                        \
-            *err |= 1;                                                       \
-            return a == 0 || b == 0 ? 0 : max;                               \
-        }                                                                    \
-        x = safe_mul_ ## type_name(a, b, &e2);                               \
-        if (!e2)                                                             \
-            return x / c;                                                    \
-        if (b > a) {                                                         \
-            x = b;                                                           \
-            b = a;                                                           \
-            a = x;                                                           \
-        }                                                                    \
-        x = safe_mul_ ## type_name(a % c, b, err);                           \
-        y = safe_mul_ ## type_name(a / c, b, err);                           \
-        return safe_add_ ## type_name(y, x / c, err);                        \
+#define OSSL_SAFE_MATH_MULDIVU(type_name, type, max)                    \
+    static ossl_inline ossl_unused type safe_muldiv_##type_name(type a, \
+        type b,                                                         \
+        type c,                                                         \
+        int *err)                                                       \
+    {                                                                   \
+        int e2 = 0;                                                     \
+        type x, y;                                                      \
+                                                                        \
+        if (c == 0) {                                                   \
+            *err |= 1;                                                  \
+            return a == 0 || b == 0 ? 0 : max;                          \
+        }                                                               \
+        x = safe_mul_##type_name(a, b, &e2);                            \
+        if (!e2)                                                        \
+            return x / c;                                               \
+        if (b > a) {                                                    \
+            x = b;                                                      \
+            b = a;                                                      \
+            a = x;                                                      \
+        }                                                               \
+        x = safe_mul_##type_name(a % c, b, err);                        \
+        y = safe_mul_##type_name(a / c, b, err);                        \
+        return safe_add_##type_name(y, x / c, err);                     \
     }
 
 /*
@@ -377,69 +377,68 @@
  * Which is usually (less safely) converted to (a + b - 1) / b
  * If you *know* that b != 0, then it's safe to ignore err.
  */
-#define OSSL_SAFE_MATH_DIV_ROUND_UP(type_name, type, max) \
-    static ossl_inline ossl_unused type safe_div_round_up_ ## type_name      \
-        (type a, type b, int *errp)                                          \
-    {                                                                        \
-        type x;                                                              \
-        int *err, err_local = 0;                                             \
-                                                                             \
-        /* Allow errors to be ignored by callers */                          \
-        err = errp != NULL ? errp : &err_local;                              \
-        /* Fast path, both positive */                                       \
-        if (b > 0 && a > 0) {                                                \
-            /* Faster path: no overflow concerns */                          \
-            if (a < max - b)                                                 \
-                return (a + b - 1) / b;                                      \
-            return a / b + (a % b != 0);                                     \
-        }                                                                    \
-        if (b == 0) {                                                        \
-            *err |= 1;                                                       \
-            return a == 0 ? 0 : max;                                         \
-        }                                                                    \
-        if (a == 0)                                                          \
-            return 0;                                                        \
-        /* Rather slow path because there are negatives involved */          \
-        x = safe_mod_ ## type_name(a, b, err);                               \
-        return safe_add_ ## type_name(safe_div_ ## type_name(a, b, err),     \
-                                      x != 0, err);                          \
+#define OSSL_SAFE_MATH_DIV_ROUND_UP(type_name, type, max)                                        \
+    static ossl_inline ossl_unused type safe_div_round_up_##type_name(type a, type b, int *errp) \
+    {                                                                                            \
+        type x;                                                                                  \
+        int *err, err_local = 0;                                                                 \
+                                                                                                 \
+        /* Allow errors to be ignored by callers */                                              \
+        err = errp != NULL ? errp : &err_local;                                                  \
+        /* Fast path, both positive */                                                           \
+        if (b > 0 && a > 0) {                                                                    \
+            /* Faster path: no overflow concerns */                                              \
+            if (a < max - b)                                                                     \
+                return (a + b - 1) / b;                                                          \
+            return a / b + (a % b != 0);                                                         \
+        }                                                                                        \
+        if (b == 0) {                                                                            \
+            *err |= 1;                                                                           \
+            return a == 0 ? 0 : max;                                                             \
+        }                                                                                        \
+        if (a == 0)                                                                              \
+            return 0;                                                                            \
+        /* Rather slow path because there are negatives involved */                              \
+        x = safe_mod_##type_name(a, b, err);                                                     \
+        return safe_add_##type_name(safe_div_##type_name(a, b, err),                             \
+            x != 0, err);                                                                        \
     }
 
 /* Calculate ranges of types */
-# define OSSL_SAFE_MATH_MINS(type) ((type)1 << (sizeof(type) * 8 - 1))
-# define OSSL_SAFE_MATH_MAXS(type) (~OSSL_SAFE_MATH_MINS(type))
-# define OSSL_SAFE_MATH_MAXU(type) (~(type)0)
+#define OSSL_SAFE_MATH_MINS(type) ((type)1 << (sizeof(type) * 8 - 1))
+#define OSSL_SAFE_MATH_MAXS(type) (~OSSL_SAFE_MATH_MINS(type))
+#define OSSL_SAFE_MATH_MAXU(type) (~(type)0)
 
 /*
  * Wrapper macros to create all the functions of a given type
  */
-# define OSSL_SAFE_MATH_SIGNED(type_name, type)                         \
-    OSSL_SAFE_MATH_ADDS(type_name, type, OSSL_SAFE_MATH_MINS(type),     \
-                        OSSL_SAFE_MATH_MAXS(type))                      \
-    OSSL_SAFE_MATH_SUBS(type_name, type, OSSL_SAFE_MATH_MINS(type),     \
-                        OSSL_SAFE_MATH_MAXS(type))                      \
-    OSSL_SAFE_MATH_MULS(type_name, type, OSSL_SAFE_MATH_MINS(type),     \
-                        OSSL_SAFE_MATH_MAXS(type))                      \
-    OSSL_SAFE_MATH_DIVS(type_name, type, OSSL_SAFE_MATH_MINS(type),     \
-                        OSSL_SAFE_MATH_MAXS(type))                      \
-    OSSL_SAFE_MATH_MODS(type_name, type, OSSL_SAFE_MATH_MINS(type),     \
-                        OSSL_SAFE_MATH_MAXS(type))                      \
-    OSSL_SAFE_MATH_DIV_ROUND_UP(type_name, type,                        \
-                                OSSL_SAFE_MATH_MAXS(type))              \
-    OSSL_SAFE_MATH_MULDIVS(type_name, type, OSSL_SAFE_MATH_MAXS(type))  \
-    OSSL_SAFE_MATH_NEGS(type_name, type, OSSL_SAFE_MATH_MINS(type))     \
+#define OSSL_SAFE_MATH_SIGNED(type_name, type)                         \
+    OSSL_SAFE_MATH_ADDS(type_name, type, OSSL_SAFE_MATH_MINS(type),    \
+        OSSL_SAFE_MATH_MAXS(type))                                     \
+    OSSL_SAFE_MATH_SUBS(type_name, type, OSSL_SAFE_MATH_MINS(type),    \
+        OSSL_SAFE_MATH_MAXS(type))                                     \
+    OSSL_SAFE_MATH_MULS(type_name, type, OSSL_SAFE_MATH_MINS(type),    \
+        OSSL_SAFE_MATH_MAXS(type))                                     \
+    OSSL_SAFE_MATH_DIVS(type_name, type, OSSL_SAFE_MATH_MINS(type),    \
+        OSSL_SAFE_MATH_MAXS(type))                                     \
+    OSSL_SAFE_MATH_MODS(type_name, type, OSSL_SAFE_MATH_MINS(type),    \
+        OSSL_SAFE_MATH_MAXS(type))                                     \
+    OSSL_SAFE_MATH_DIV_ROUND_UP(type_name, type,                       \
+        OSSL_SAFE_MATH_MAXS(type))                                     \
+    OSSL_SAFE_MATH_MULDIVS(type_name, type, OSSL_SAFE_MATH_MAXS(type)) \
+    OSSL_SAFE_MATH_NEGS(type_name, type, OSSL_SAFE_MATH_MINS(type))    \
     OSSL_SAFE_MATH_ABSS(type_name, type, OSSL_SAFE_MATH_MINS(type))
 
-# define OSSL_SAFE_MATH_UNSIGNED(type_name, type) \
-    OSSL_SAFE_MATH_ADDU(type_name, type, OSSL_SAFE_MATH_MAXU(type))     \
-    OSSL_SAFE_MATH_SUBU(type_name, type)                                \
-    OSSL_SAFE_MATH_MULU(type_name, type, OSSL_SAFE_MATH_MAXU(type))     \
-    OSSL_SAFE_MATH_DIVU(type_name, type, OSSL_SAFE_MATH_MAXU(type))     \
-    OSSL_SAFE_MATH_MODU(type_name, type)                                \
-    OSSL_SAFE_MATH_DIV_ROUND_UP(type_name, type,                        \
-                                OSSL_SAFE_MATH_MAXU(type))              \
-    OSSL_SAFE_MATH_MULDIVU(type_name, type, OSSL_SAFE_MATH_MAXU(type))  \
-    OSSL_SAFE_MATH_NEGU(type_name, type)                                \
+#define OSSL_SAFE_MATH_UNSIGNED(type_name, type)                       \
+    OSSL_SAFE_MATH_ADDU(type_name, type, OSSL_SAFE_MATH_MAXU(type))    \
+    OSSL_SAFE_MATH_SUBU(type_name, type)                               \
+    OSSL_SAFE_MATH_MULU(type_name, type, OSSL_SAFE_MATH_MAXU(type))    \
+    OSSL_SAFE_MATH_DIVU(type_name, type, OSSL_SAFE_MATH_MAXU(type))    \
+    OSSL_SAFE_MATH_MODU(type_name, type)                               \
+    OSSL_SAFE_MATH_DIV_ROUND_UP(type_name, type,                       \
+        OSSL_SAFE_MATH_MAXU(type))                                     \
+    OSSL_SAFE_MATH_MULDIVU(type_name, type, OSSL_SAFE_MATH_MAXU(type)) \
+    OSSL_SAFE_MATH_NEGU(type_name, type)                               \
     OSSL_SAFE_MATH_ABSU(type_name, type)
 
-#endif                          /* OSSL_INTERNAL_SAFE_MATH_H */
+#endif /* OSSL_INTERNAL_SAFE_MATH_H */
diff --git a/include/internal/sha3.h b/include/internal/sha3.h
index aebdd6eb8f53..d67aa1e19f55 100644
--- a/include/internal/sha3.h
+++ b/include/internal/sha3.h
@@ -9,22 +9,22 @@
 
 /* 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 *in, size_t inlen);
-typedef int (sha3_final_fn)(void *vctx, unsigned char *out, size_t outlen);
-typedef int (sha3_squeeze_fn)(void *vctx, unsigned char *out, size_t outlen);
+typedef size_t(sha3_absorb_fn)(void *vctx, const void *in, size_t inlen);
+typedef int(sha3_final_fn)(void *vctx, unsigned char *out, size_t outlen);
+typedef int(sha3_squeeze_fn)(void *vctx, unsigned char *out, size_t outlen);
 
 typedef struct prov_sha3_meth_st {
     sha3_absorb_fn *absorb;
@@ -32,17 +32,17 @@ typedef struct prov_sha3_meth_st {
     sha3_squeeze_fn *squeeze;
 } PROV_SHA3_METHOD;
 
-#define XOF_STATE_INIT    0
-#define XOF_STATE_ABSORB  1
-#define XOF_STATE_FINAL   2
+#define XOF_STATE_INIT 0
+#define XOF_STATE_ABSORB 1
+#define XOF_STATE_FINAL 2
 #define XOF_STATE_SQUEEZE 3
 
 struct keccak_st {
     uint64_t A[5][5];
     unsigned char buf[KECCAK1600_WIDTH / 8 - 32];
-    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 pad;
     PROV_SHA3_METHOD meth;
     int xof_state;
@@ -51,12 +51,12 @@ 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_init(KECCAK1600_CTX *ctx, unsigned char pad,
-                     size_t typelen, size_t mdlen);
+    size_t typelen, size_t mdlen);
 int ossl_sha3_update(KECCAK1600_CTX *ctx, const void *_inp, size_t len);
 int ossl_sha3_final(KECCAK1600_CTX *ctx, unsigned char *out, size_t outlen);
 int ossl_sha3_squeeze(KECCAK1600_CTX *ctx, unsigned char *out, size_t outlen);
 
 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 713a7466ae06..49c381e394e9 100644
--- a/include/internal/sizes.h
+++ b/include/internal/sizes.h
@@ -8,16 +8,16 @@
  */
 
 #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_CODEC_STRUCT_SIZE   32 /* DATA_STRUCTURE name */
+#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_CODEC_STRUCT_SIZE 32 /* DATA_STRUCTURE name */
 
 #endif
diff --git a/include/internal/skey.h b/include/internal/skey.h
index 6d0c643c3f19..a4b6c6e6a9e5 100644
--- a/include/internal/skey.h
+++ b/include/internal/skey.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OSSL_CRYPTO_SKEY_H
-# define OSSL_CRYPTO_SKEY_H
+#define OSSL_CRYPTO_SKEY_H
 
 /* Known symmetric key type definitions */
-# define SKEY_TYPE_GENERIC 1 /* generic bytes container unknown key types */
-# define SKEY_TYPE_AES 2 /* AES keys */
+#define SKEY_TYPE_GENERIC 1 /* generic bytes container unknown key types */
+#define SKEY_TYPE_AES 2 /* AES keys */
 
 struct prov_skey_st {
     /*
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 d28208b31340..877bbd7145b0 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -8,49 +8,49 @@
  */
 
 #ifndef OSSL_INTERNAL_SOCKETS_H
-# define OSSL_INTERNAL_SOCKETS_H
-# pragma once
+#define OSSL_INTERNAL_SOCKETS_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include "internal/common.h"
+#include <openssl/opensslconf.h>
+#include "internal/common.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 "internal/e_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 "internal/e_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
@@ -58,155 +58,155 @@ 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
 
 /* Windows have other names for shutdown() reasons */
-#  ifndef SHUT_RD
-#   define SHUT_RD SD_RECEIVE
-#  endif
-#  ifndef SHUT_WR
-#   define SHUT_WR SD_SEND
-#  endif
-#  ifndef SHUT_RDWR
-#   define SHUT_RDWR SD_BOTH
-#  endif
+#ifndef SHUT_RD
+#define SHUT_RD SD_RECEIVE
+#endif
+#ifndef SHUT_WR
+#define SHUT_WR SD_SEND
+#endif
+#ifndef SHUT_RDWR
+#define SHUT_RDWR SD_BOTH
+#endif
 
-# else
-#  if defined(__APPLE__)
-    /*
-     * This must be defined before including <netinet/in6.h> to get
-     * IPV6_RECVPKTINFO
-     */
-#   define __APPLE_USE_RFC_3542
-#  endif
+#else
+#if defined(__APPLE__)
+/*
+ * This must be defined before including <netinet/in6.h> to get
+ * IPV6_RECVPKTINFO
+ */
+#define __APPLE_USE_RFC_3542
+#endif
 
-#  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)
-typedef size_t socklen_t;        /* Currently appears to be missing on VMS */
-#  endif
-#  if defined(OPENSSL_SYS_VMS_NODECC)
-#   include <socket.h>
-#   include <in.h>
-#   include <inet.h>
-#  else
-#   include <sys/socket.h>
-#   if !defined(NO_SYS_UN_H) && defined(AF_UNIX) && !defined(OPENSSL_NO_UNIX_SOCK)
-#    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)
+typedef size_t socklen_t; /* Currently appears to be missing on VMS */
+#endif
+#if defined(OPENSSL_SYS_VMS_NODECC)
+#include <socket.h>
+#include <in.h>
+#include <inet.h>
+#else
+#include <sys/socket.h>
+#if !defined(NO_SYS_UN_H) && defined(AF_UNIX) && !defined(OPENSSL_NO_UNIX_SOCK)
+#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
 
-#  ifdef OPENSSL_SYS_UNIX
-#    ifndef OPENSSL_SYS_TANDEM
-#     include <poll.h>
-#    endif
-#    include <errno.h>
-#  endif
+#ifdef OPENSSL_SYS_UNIX
+#ifndef OPENSSL_SYS_TANDEM
+#include <poll.h>
+#endif
+#include <errno.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
 
 /*
  * Some platforms define AF_UNIX, but don't support it
  */
-# if !defined(OPENSSL_NO_UNIX_SOCK)
-#  if !defined(AF_UNIX) || defined(NO_SYS_UN_H)
-#   define OPENSSL_NO_UNIX_SOCK
-#  endif
-# endif
+#if !defined(OPENSSL_NO_UNIX_SOCK)
+#if !defined(AF_UNIX) || defined(NO_SYS_UN_H)
+#define OPENSSL_NO_UNIX_SOCK
+#endif
+#endif
 
-# define get_last_socket_error() errno
-# define clear_socket_error()    errno=0
-# define get_last_socket_error_is_eintr() (get_last_socket_error() == EINTR)
+#define get_last_socket_error() errno
+#define clear_socket_error() errno = 0
+#define get_last_socket_error_is_eintr() (get_last_socket_error() == EINTR)
 
-# if defined(OPENSSL_SYS_WINDOWS)
-#  undef get_last_socket_error
-#  undef clear_socket_error
-#  undef get_last_socket_error_is_eintr
-#  define get_last_socket_error() WSAGetLastError()
-#  define clear_socket_error()    WSASetLastError(0)
-#  define get_last_socket_error_is_eintr() (get_last_socket_error() == WSAEINTR)
-#  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)
-#  define readsocket(s,b,n)       read((s),(b),(n))
-#  define writesocket(s,b,n)      write((s),(b),(n))
-#  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
+#undef get_last_socket_error_is_eintr
+#define get_last_socket_error() WSAGetLastError()
+#define clear_socket_error() WSASetLastError(0)
+#define get_last_socket_error_is_eintr() (get_last_socket_error() == WSAEINTR)
+#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)
+#define readsocket(s, b, n) read((s), (b), (n))
+#define writesocket(s, b, n) write((s), (b), (n))
+#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/ssl.h b/include/internal/ssl.h
index 689f3484ff7b..5093f779e241 100644
--- a/include/internal/ssl.h
+++ b/include/internal/ssl.h
@@ -10,17 +10,24 @@
 #include <openssl/ssl.h>
 
 #ifndef OSSL_INTERNAL_SSL_H
-# define OSSL_INTERNAL_SSL_H
-# pragma once
+#define OSSL_INTERNAL_SSL_H
+#pragma once
 
 typedef void (*ossl_msg_cb)(int write_p, int version, int content_type,
-                            const void *buf, size_t len, SSL *ssl, void *arg);
+    const void *buf, size_t len, SSL *ssl, void *arg);
 
 int ossl_ssl_get_error(const SSL *s, int i, int check_err);
 
+/*
+ * Test to see if an SSL_CTX is using a QUIC method
+ * This is public in the master branch
+ * but made private for current stable branches
+ */
+int SSL_CTX_is_quic(const SSL_CTX *c);
+
 /* Set if this is the QUIC handshake layer */
-# define TLS1_FLAGS_QUIC                         0x2000
+#define TLS1_FLAGS_QUIC 0x2000
 /* Set if this is our QUIC handshake layer */
-# define TLS1_FLAGS_QUIC_INTERNAL                0x4000
+#define TLS1_FLAGS_QUIC_INTERNAL 0x4000
 
 #endif
diff --git a/include/internal/ssl3_cbc.h b/include/internal/ssl3_cbc.h
index 4fb5da1906e2..4c102693a0fb 100644
--- a/include/internal/ssl3_cbc.h
+++ b/include/internal/ssl3_cbc.h
@@ -11,30 +11,30 @@
 
 /* tls_pad.c */
 int ssl3_cbc_remove_padding_and_mac(size_t *reclen,
-                                    size_t origreclen,
-                                    unsigned char *recdata,
-                                    unsigned char **mac,
-                                    int *alloced,
-                                    size_t block_size, size_t mac_size,
-                                    OSSL_LIB_CTX *libctx);
+    size_t origreclen,
+    unsigned char *recdata,
+    unsigned char **mac,
+    int *alloced,
+    size_t block_size, size_t mac_size,
+    OSSL_LIB_CTX *libctx);
 
 int tls1_cbc_remove_padding_and_mac(size_t *reclen,
-                                    size_t origreclen,
-                                    unsigned char *recdata,
-                                    unsigned char **mac,
-                                    int *alloced,
-                                    size_t block_size, size_t mac_size,
-                                    int aead,
-                                    OSSL_LIB_CTX *libctx);
+    size_t origreclen,
+    unsigned char *recdata,
+    unsigned char **mac,
+    int *alloced,
+    size_t block_size, size_t mac_size,
+    int aead,
+    OSSL_LIB_CTX *libctx);
 
 /* ssl3_cbc.c */
 __owur char ssl3_cbc_record_digest_supported(const EVP_MD_CTX *ctx);
 __owur int ssl3_cbc_digest_record(const EVP_MD *md,
-                                  unsigned char *md_out,
-                                  size_t *md_out_size,
-                                  const unsigned char *header,
-                                  const unsigned char *data,
-                                  size_t data_size,
-                                  size_t data_plus_mac_plus_padding_size,
-                                  const unsigned char *mac_secret,
-                                  size_t mac_secret_length, char is_sslv3);
+    unsigned char *md_out,
+    size_t *md_out_size,
+    const unsigned char *header,
+    const unsigned char *data,
+    size_t data_size,
+    size_t data_plus_mac_plus_padding_size,
+    const unsigned char *mac_secret,
+    size_t mac_secret_length, char is_sslv3);
diff --git a/include/internal/ssl_unwrap.h b/include/internal/ssl_unwrap.h
index 86c134569883..ec6dbffa924a 100644
--- a/include/internal/ssl_unwrap.h
+++ b/include/internal/ssl_unwrap.h
@@ -8,123 +8,121 @@
  */
 
 #ifndef OSSL_SSL_UNWRAP_H
-# define OSSL_SSL_UNWRAP_H
+#define OSSL_SSL_UNWRAP_H
 
-# include <openssl/ssl.h>
-# include "internal/quic_predef.h"
+#include <openssl/ssl.h>
+#include "internal/quic_predef.h"
 
-# define SSL_CONNECTION_FROM_SSL_ONLY_int(ssl, c) \
-    ((ssl) == NULL ? NULL                         \
-     : ((ssl)->type == SSL_TYPE_SSL_CONNECTION    \
-       ? (c SSL_CONNECTION *)(ssl)                \
-       : NULL))
-# define SSL_CONNECTION_NO_CONST
-# define SSL_CONNECTION_FROM_SSL_ONLY(ssl) \
+#define SSL_CONNECTION_FROM_SSL_ONLY_int(ssl, c)             \
+    ((ssl) == NULL ? NULL                                    \
+                   : ((ssl)->type == SSL_TYPE_SSL_CONNECTION \
+                             ? (c SSL_CONNECTION *)(ssl)     \
+                             : NULL))
+#define SSL_CONNECTION_NO_CONST
+#define SSL_CONNECTION_FROM_SSL_ONLY(ssl) \
     SSL_CONNECTION_FROM_SSL_ONLY_int(ssl, SSL_CONNECTION_NO_CONST)
-# define SSL_CONNECTION_FROM_CONST_SSL_ONLY(ssl) \
+#define SSL_CONNECTION_FROM_CONST_SSL_ONLY(ssl) \
     SSL_CONNECTION_FROM_SSL_ONLY_int(ssl, const)
-# define SSL_CONNECTION_GET_CTX(sc) ((sc)->ssl.ctx)
-# define SSL_CONNECTION_GET_SSL(sc) (&(sc)->ssl)
-# define SSL_CONNECTION_GET_USER_SSL(sc) ((sc)->user_ssl)
-# ifndef OPENSSL_NO_QUIC
+#define SSL_CONNECTION_GET_CTX(sc) ((sc)->ssl.ctx)
+#define SSL_CONNECTION_GET_SSL(sc) (&(sc)->ssl)
+#define SSL_CONNECTION_GET_USER_SSL(sc) ((sc)->user_ssl)
+#ifndef OPENSSL_NO_QUIC
 struct ssl_connection_st *ossl_quic_obj_get0_handshake_layer(QUIC_OBJ *obj);
-#  define SSL_CONNECTION_FROM_SSL_int(ssl, c)                                           \
-    ((ssl) == NULL ? NULL                                                               \
-     : ((ssl)->type == SSL_TYPE_SSL_CONNECTION                                          \
-        ? (c SSL_CONNECTION *)(ssl)                                                     \
-        : (SSL_TYPE_IS_QUIC((ssl)->type)                                                \
-          ? (c SSL_CONNECTION *)ossl_quic_obj_get0_handshake_layer((QUIC_OBJ *)(ssl))   \
-          : NULL)))
-#  define SSL_CONNECTION_FROM_SSL(ssl) \
+#define SSL_CONNECTION_FROM_SSL_int(ssl, c)                                                                        \
+    ((ssl) == NULL ? NULL                                                                                          \
+                   : ((ssl)->type == SSL_TYPE_SSL_CONNECTION                                                       \
+                             ? (c SSL_CONNECTION *)(ssl)                                                           \
+                             : (SSL_TYPE_IS_QUIC((ssl)->type)                                                      \
+                                       ? (c SSL_CONNECTION *)ossl_quic_obj_get0_handshake_layer((QUIC_OBJ *)(ssl)) \
+                                       : NULL)))
+#define SSL_CONNECTION_FROM_SSL(ssl) \
     SSL_CONNECTION_FROM_SSL_int(ssl, SSL_CONNECTION_NO_CONST)
-#  define SSL_CONNECTION_FROM_CONST_SSL(ssl) \
+#define SSL_CONNECTION_FROM_CONST_SSL(ssl) \
     SSL_CONNECTION_FROM_SSL_int(ssl, const)
-# else
-#  define SSL_CONNECTION_FROM_SSL(ssl) \
+#else
+#define SSL_CONNECTION_FROM_SSL(ssl) \
     SSL_CONNECTION_FROM_SSL_ONLY_int(ssl, SSL_CONNECTION_NO_CONST)
-#  define SSL_CONNECTION_FROM_CONST_SSL(ssl) \
+#define SSL_CONNECTION_FROM_CONST_SSL(ssl) \
     SSL_CONNECTION_FROM_SSL_ONLY_int(ssl, const)
-# endif
+#endif
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
-#  define IS_QUIC_METHOD(m) \
-    ((m) == OSSL_QUIC_client_method() || \
-     (m) == OSSL_QUIC_client_thread_method() || \
-     (m) == OSSL_QUIC_server_method())
+#define IS_QUIC_METHOD(m) \
+    ((m) == OSSL_QUIC_client_method() || (m) == OSSL_QUIC_client_thread_method() || (m) == OSSL_QUIC_server_method())
 
-#  define IS_QUIC_CTX(ctx)          IS_QUIC_METHOD((ctx)->method)
+#define IS_QUIC_CTX(ctx) IS_QUIC_METHOD((ctx)->method)
 
-#  define QUIC_CONNECTION_FROM_SSL_int(ssl, c)   \
-     ((ssl) == NULL ? NULL                       \
-      : ((ssl)->type == SSL_TYPE_QUIC_CONNECTION \
-         ? (c QUIC_CONNECTION *)(ssl)            \
-         : NULL))
+#define QUIC_CONNECTION_FROM_SSL_int(ssl, c)                  \
+    ((ssl) == NULL ? NULL                                     \
+                   : ((ssl)->type == SSL_TYPE_QUIC_CONNECTION \
+                             ? (c QUIC_CONNECTION *)(ssl)     \
+                             : NULL))
 
-#  define QUIC_XSO_FROM_SSL_int(ssl, c)                             \
-    ((ssl) == NULL                                                  \
-     ? NULL                                                         \
-     : (((ssl)->type == SSL_TYPE_QUIC_XSO                           \
-        ? (c QUIC_XSO *)(ssl)                                       \
-        : ((ssl)->type == SSL_TYPE_QUIC_CONNECTION                  \
-           ? (c QUIC_XSO *)((QUIC_CONNECTION *)(ssl))->default_xso  \
-           : NULL))))
+#define QUIC_XSO_FROM_SSL_int(ssl, c)                                                   \
+    ((ssl) == NULL                                                                      \
+            ? NULL                                                                      \
+            : (((ssl)->type == SSL_TYPE_QUIC_XSO                                        \
+                      ? (c QUIC_XSO *)(ssl)                                             \
+                      : ((ssl)->type == SSL_TYPE_QUIC_CONNECTION                        \
+                                ? (c QUIC_XSO *)((QUIC_CONNECTION *)(ssl))->default_xso \
+                                : NULL))))
 
-#  define SSL_CONNECTION_FROM_QUIC_SSL_int(ssl, c)               \
-     ((ssl) == NULL ? NULL                                       \
-      : ((ssl)->type == SSL_TYPE_QUIC_CONNECTION                 \
-         ? (c SSL_CONNECTION *)((c QUIC_CONNECTION *)(ssl))->tls \
-         : NULL))
+#define SSL_CONNECTION_FROM_QUIC_SSL_int(ssl, c)                                     \
+    ((ssl) == NULL ? NULL                                                            \
+                   : ((ssl)->type == SSL_TYPE_QUIC_CONNECTION                        \
+                             ? (c SSL_CONNECTION *)((c QUIC_CONNECTION *)(ssl))->tls \
+                             : NULL))
 
-#  define QUIC_LISTENER_FROM_SSL_int(ssl, c)                            \
-    ((ssl) == NULL                                                      \
-     ? NULL                                                             \
-     : ((ssl)->type == SSL_TYPE_QUIC_LISTENER                           \
-        ? (c QUIC_LISTENER *)(ssl)                                      \
-        : NULL))
+#define QUIC_LISTENER_FROM_SSL_int(ssl, c)           \
+    ((ssl) == NULL                                   \
+            ? NULL                                   \
+            : ((ssl)->type == SSL_TYPE_QUIC_LISTENER \
+                      ? (c QUIC_LISTENER *)(ssl)     \
+                      : NULL))
 
-#  define QUIC_DOMAIN_FROM_SSL_int(ssl, c)                              \
-    ((ssl) == NULL                                                      \
-     ? NULL                                                             \
-     : ((ssl)->type == SSL_TYPE_QUIC_DOMAIN                             \
-        ? (c QUIC_DOMAIN *)(ssl)                                        \
-        : NULL))
+#define QUIC_DOMAIN_FROM_SSL_int(ssl, c)           \
+    ((ssl) == NULL                                 \
+            ? NULL                                 \
+            : ((ssl)->type == SSL_TYPE_QUIC_DOMAIN \
+                      ? (c QUIC_DOMAIN *)(ssl)     \
+                      : NULL))
 
-#  define IS_QUIC_CS(ssl) ((ssl) != NULL                                \
-                           && ((ssl)->type == SSL_TYPE_QUIC_CONNECTION  \
-                               || (ssl)->type == SSL_TYPE_QUIC_XSO))
+#define IS_QUIC_CS(ssl) ((ssl) != NULL          \
+    && ((ssl)->type == SSL_TYPE_QUIC_CONNECTION \
+        || (ssl)->type == SSL_TYPE_QUIC_XSO))
 
-#  define IS_QUIC(ssl)                                                  \
+#define IS_QUIC(ssl) \
     ((ssl) != NULL && SSL_TYPE_IS_QUIC((ssl)->type))
 
-# else
+#else
 
-#  define QUIC_CONNECTION_FROM_SSL_int(ssl, c) NULL
-#  define QUIC_XSO_FROM_SSL_int(ssl, c) NULL
-#  define QUIC_LISTENER_FROM_SSL_int(ssl, c) NULL
-#  define SSL_CONNECTION_FROM_QUIC_SSL_int(ssl, c) NULL
-#  define IS_QUIC(ssl) 0
-#  define IS_QUIC_CS(ssl) 0
-#  define IS_QUIC_CTX(ctx) 0
-#  define IS_QUIC_METHOD(m) 0
+#define QUIC_CONNECTION_FROM_SSL_int(ssl, c) NULL
+#define QUIC_XSO_FROM_SSL_int(ssl, c) NULL
+#define QUIC_LISTENER_FROM_SSL_int(ssl, c) NULL
+#define SSL_CONNECTION_FROM_QUIC_SSL_int(ssl, c) NULL
+#define IS_QUIC(ssl) 0
+#define IS_QUIC_CS(ssl) 0
+#define IS_QUIC_CTX(ctx) 0
+#define IS_QUIC_METHOD(m) 0
 
-# endif
+#endif
 
-# define QUIC_CONNECTION_FROM_SSL(ssl) \
+#define QUIC_CONNECTION_FROM_SSL(ssl) \
     QUIC_CONNECTION_FROM_SSL_int(ssl, SSL_CONNECTION_NO_CONST)
-# define QUIC_CONNECTION_FROM_CONST_SSL(ssl) \
+#define QUIC_CONNECTION_FROM_CONST_SSL(ssl) \
     QUIC_CONNECTION_FROM_SSL_int(ssl, const)
-# define QUIC_XSO_FROM_SSL(ssl) \
+#define QUIC_XSO_FROM_SSL(ssl) \
     QUIC_XSO_FROM_SSL_int(ssl, SSL_CONNECTION_NO_CONST)
-# define QUIC_XSO_FROM_CONST_SSL(ssl) \
+#define QUIC_XSO_FROM_CONST_SSL(ssl) \
     QUIC_XSO_FROM_SSL_int(ssl, const)
-# define QUIC_LISTENER_FROM_SSL(ssl) \
+#define QUIC_LISTENER_FROM_SSL(ssl) \
     QUIC_LISTENER_FROM_SSL_int(ssl, SSL_CONNECTION_NO_CONST)
-# define QUIC_LISTENER_FROM_CONST_SSL(ssl) \
+#define QUIC_LISTENER_FROM_CONST_SSL(ssl) \
     QUIC_LISTENER_FROM_SSL_int(ssl, const)
-# define SSL_CONNECTION_FROM_QUIC_SSL(ssl) \
+#define SSL_CONNECTION_FROM_QUIC_SSL(ssl) \
     SSL_CONNECTION_FROM_QUIC_SSL_int(ssl, SSL_CONNECTION_NO_CONST)
-# define SSL_CONNECTION_FROM_CONST_QUIC_SSL(ssl) \
+#define SSL_CONNECTION_FROM_CONST_QUIC_SSL(ssl) \
     SSL_CONNECTION_FROM_CONST_QUIC_SSL_int(ssl, const)
 
 #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/statem.h b/include/internal/statem.h
index 261d7967cc9a..a41ed3227031 100644
--- a/include/internal/statem.h
+++ b/include/internal/statem.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_INTERNAL_STATEM_H
-# define OSSL_INTERNAL_STATEM_H
+#define OSSL_INTERNAL_STATEM_H
 
 /*****************************************************************************
  *                                                                           *
@@ -82,10 +82,10 @@ typedef enum {
 } CON_FUNC_RETURN;
 
 typedef int (*ossl_statem_mutate_handshake_cb)(const unsigned char *msgin,
-                                               size_t inlen,
-                                               unsigned char **msgout,
-                                               size_t *outlen,
-                                               void *arg);
+    size_t inlen,
+    unsigned char **msgout,
+    size_t *outlen,
+    void *arg);
 
 typedef void (*ossl_statem_finish_mutate_handshake_cb)(void *arg);
 
@@ -143,13 +143,13 @@ void ossl_statem_clear(SSL_CONNECTION *s);
 void ossl_statem_set_renegotiate(SSL_CONNECTION *s);
 void ossl_statem_send_fatal(SSL_CONNECTION *s, int al);
 void ossl_statem_fatal(SSL_CONNECTION *s, int al, int reason,
-                       const char *fmt, ...);
-# define SSLfatal_alert(s, al) ossl_statem_send_fatal((s), (al))
-# define SSLfatal(s, al, r) SSLfatal_data((s), (al), (r), NULL)
-# define SSLfatal_data                                          \
-    (ERR_new(),                                                 \
-     ERR_set_debug(OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC),   \
-     ossl_statem_fatal)
+    const char *fmt, ...);
+#define SSLfatal_alert(s, al) ossl_statem_send_fatal((s), (al))
+#define SSLfatal(s, al, r) SSLfatal_data((s), (al), (r), NULL)
+#define SSLfatal_data                                            \
+    (ERR_new(),                                                  \
+        ERR_set_debug(OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC), \
+        ossl_statem_fatal)
 
 int ossl_statem_in_error(const SSL_CONNECTION *s);
 void ossl_statem_set_in_init(SSL_CONNECTION *s, int init);
@@ -166,8 +166,8 @@ __owur int ossl_statem_export_early_allowed(SSL_CONNECTION *s);
 int statem_flush(SSL_CONNECTION *s);
 
 int ossl_statem_set_mutator(SSL *s,
-                            ossl_statem_mutate_handshake_cb mutate_handshake_cb,
-                            ossl_statem_finish_mutate_handshake_cb finish_mutate_handshake_cb,
-                            void *mutatearg);
+    ossl_statem_mutate_handshake_cb mutate_handshake_cb,
+    ossl_statem_finish_mutate_handshake_cb finish_mutate_handshake_cb,
+    void *mutatearg);
 
 #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.h b/include/internal/thread.h
index 8c5bad77635e..eaff038567ee 100644
--- a/include/internal/thread.h
+++ b/include/internal/thread.h
@@ -8,23 +8,23 @@
  */
 
 #ifndef OPENSSL_INTERNAL_THREAD_H
-# define OPENSSL_INTERNAL_THREAD_H
-# include <openssl/configuration.h>
-# include <internal/thread_arch.h>
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include <internal/cryptlib.h>
-# include "crypto/context.h"
+#define OPENSSL_INTERNAL_THREAD_H
+#include <openssl/configuration.h>
+#include <internal/thread_arch.h>
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include <internal/cryptlib.h>
+#include "crypto/context.h"
 
 void *ossl_crypto_thread_start(OSSL_LIB_CTX *ctx, CRYPTO_THREAD_ROUTINE start,
-                               void *data);
+    void *data);
 int ossl_crypto_thread_join(void *task, CRYPTO_THREAD_RETVAL *retval);
 int ossl_crypto_thread_clean(void *vhandle);
 uint64_t ossl_get_avail_threads(OSSL_LIB_CTX *ctx);
 
-# if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
 
-#  define OSSL_LIB_CTX_GET_THREADS(CTX)                                       \
+#define OSSL_LIB_CTX_GET_THREADS(CTX) \
     ossl_lib_ctx_get_data(CTX, OSSL_LIB_CTX_THREAD_INDEX);
 
 typedef struct openssl_threads_st {
@@ -34,6 +34,6 @@ typedef struct openssl_threads_st {
     CRYPTO_CONDVAR *cond_finished;
 } OSSL_LIB_CTX_THREADS;
 
-# endif /* defined(OPENSSL_THREADS) */
+#endif /* defined(OPENSSL_THREADS) */
 
 #endif /* OPENSSL_INTERNAL_THREAD_H */
diff --git a/include/internal/thread_arch.h b/include/internal/thread_arch.h
index aba9362e8d6f..d7fc08a8afaa 100644
--- a/include/internal/thread_arch.h
+++ b/include/internal/thread_arch.h
@@ -8,34 +8,33 @@
  */
 
 #ifndef OSSL_INTERNAL_THREAD_ARCH_H
-# define OSSL_INTERNAL_THREAD_ARCH_H
-# include <openssl/configuration.h>
-# include <openssl/e_os2.h>
-# include "internal/time.h"
+#define OSSL_INTERNAL_THREAD_ARCH_H
+#include <openssl/configuration.h>
+#include <openssl/e_os2.h>
+#include "internal/time.h"
 
-# if defined(_WIN32)
-#  include <windows.h>
-# endif
+#if defined(_WIN32)
+#include <windows.h>
+#endif
 
-# if defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_UNIX)
-#  define OPENSSL_THREADS_POSIX
-# elif defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_VMS)
-#  define OPENSSL_THREADS_POSIX
-# elif defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_WINDOWS) && \
-    defined(_WIN32_WINNT)
-#  if _WIN32_WINNT >= 0x0600
-#   define OPENSSL_THREADS_WINNT
-#  elif _WIN32_WINNT >= 0x0501
-#   define OPENSSL_THREADS_WINNT
-#   define OPENSSL_THREADS_WINNT_LEGACY
-#  else
-#   define OPENSSL_THREADS_NONE
-#  endif
-# else
-#  define OPENSSL_THREADS_NONE
-# endif
+#if defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_UNIX)
+#define OPENSSL_THREADS_POSIX
+#elif defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_VMS)
+#define OPENSSL_THREADS_POSIX
+#elif defined(OPENSSL_THREADS) && defined(OPENSSL_SYS_WINDOWS) && defined(_WIN32_WINNT)
+#if _WIN32_WINNT >= 0x0600
+#define OPENSSL_THREADS_WINNT
+#elif _WIN32_WINNT >= 0x0501
+#define OPENSSL_THREADS_WINNT
+#define OPENSSL_THREADS_WINNT_LEGACY
+#else
+#define OPENSSL_THREADS_NONE
+#endif
+#else
+#define OPENSSL_THREADS_NONE
+#endif
 
-# include <openssl/crypto.h>
+#include <openssl/crypto.h>
 
 typedef struct crypto_mutex_st CRYPTO_MUTEX;
 typedef struct crypto_condvar_st CRYPTO_CONDVAR;
@@ -49,7 +48,7 @@ void ossl_crypto_mutex_free(CRYPTO_MUTEX **mutex);
 CRYPTO_CONDVAR *ossl_crypto_condvar_new(void);
 void ossl_crypto_condvar_wait(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex);
 void ossl_crypto_condvar_wait_timeout(CRYPTO_CONDVAR *cv, CRYPTO_MUTEX *mutex,
-                                      OSSL_TIME deadline);
+    OSSL_TIME deadline);
 void ossl_crypto_condvar_broadcast(CRYPTO_CONDVAR *cv);
 void ossl_crypto_condvar_signal(CRYPTO_CONDVAR *cv);
 void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv);
@@ -57,16 +56,16 @@ void ossl_crypto_condvar_free(CRYPTO_CONDVAR **cv);
 typedef uint32_t CRYPTO_THREAD_RETVAL;
 typedef CRYPTO_THREAD_RETVAL (*CRYPTO_THREAD_ROUTINE)(void *);
 typedef CRYPTO_THREAD_RETVAL (*CRYPTO_THREAD_ROUTINE_CB)(void *,
-                                                         void (**)(void *),
-                                                         void **);
+    void (**)(void *),
+    void **);
 
-# define CRYPTO_THREAD_NO_STATE   0UL
-# define CRYPTO_THREAD_FINISHED   (1UL << 0)
-# define CRYPTO_THREAD_JOIN_AWAIT (1UL << 1)
-# define CRYPTO_THREAD_JOINED     (1UL << 2)
+#define CRYPTO_THREAD_NO_STATE 0UL
+#define CRYPTO_THREAD_FINISHED (1UL << 0)
+#define CRYPTO_THREAD_JOIN_AWAIT (1UL << 1)
+#define CRYPTO_THREAD_JOINED (1UL << 2)
 
-# define CRYPTO_THREAD_GET_STATE(THREAD, FLAG) ((THREAD)->state & (FLAG))
-# define CRYPTO_THREAD_GET_ERROR(THREAD, FLAG) (((THREAD)->state >> 16) & (FLAG))
+#define CRYPTO_THREAD_GET_STATE(THREAD, FLAG) ((THREAD)->state & (FLAG))
+#define CRYPTO_THREAD_GET_ERROR(THREAD, FLAG) (((THREAD)->state >> 16) & (FLAG))
 
 typedef struct crypto_thread_st {
     uint32_t state;
@@ -82,44 +81,44 @@ typedef struct crypto_thread_st {
     OSSL_LIB_CTX *ctx;
 } CRYPTO_THREAD;
 
-# if defined(OPENSSL_THREADS)
+#if defined(OPENSSL_THREADS)
 
-#  define CRYPTO_THREAD_UNSET_STATE(THREAD, FLAG)                       \
-    do {                                                                \
-        (THREAD)->state &= ~(FLAG);                                     \
+#define CRYPTO_THREAD_UNSET_STATE(THREAD, FLAG) \
+    do {                                        \
+        (THREAD)->state &= ~(FLAG);             \
     } while ((void)0, 0)
 
-#  define CRYPTO_THREAD_SET_STATE(THREAD, FLAG)                         \
-    do {                                                                \
-        (THREAD)->state |= (FLAG);                                      \
+#define CRYPTO_THREAD_SET_STATE(THREAD, FLAG) \
+    do {                                      \
+        (THREAD)->state |= (FLAG);            \
     } while ((void)0, 0)
 
-#  define CRYPTO_THREAD_SET_ERROR(THREAD, FLAG)                         \
-    do {                                                                \
-        (THREAD)->state |= ((FLAG) << 16);                              \
+#define CRYPTO_THREAD_SET_ERROR(THREAD, FLAG) \
+    do {                                      \
+        (THREAD)->state |= ((FLAG) << 16);    \
     } while ((void)0, 0)
 
-#  define CRYPTO_THREAD_UNSET_ERROR(THREAD, FLAG)                       \
-    do {                                                                \
-        (THREAD)->state &= ~((FLAG) << 16);                             \
+#define CRYPTO_THREAD_UNSET_ERROR(THREAD, FLAG) \
+    do {                                        \
+        (THREAD)->state &= ~((FLAG) << 16);     \
     } while ((void)0, 0)
 
-# else
+#else
 
-#  define CRYPTO_THREAD_UNSET_STATE(THREAD, FLAG)
-#  define CRYPTO_THREAD_SET_STATE(THREAD, FLAG)
-#  define CRYPTO_THREAD_SET_ERROR(THREAD, FLAG)
-#  define CRYPTO_THREAD_UNSET_ERROR(THREAD, FLAG)
+#define CRYPTO_THREAD_UNSET_STATE(THREAD, FLAG)
+#define CRYPTO_THREAD_SET_STATE(THREAD, FLAG)
+#define CRYPTO_THREAD_SET_ERROR(THREAD, FLAG)
+#define CRYPTO_THREAD_UNSET_ERROR(THREAD, FLAG)
 
-# endif /* defined(OPENSSL_THREADS) */
+#endif /* defined(OPENSSL_THREADS) */
 
-CRYPTO_THREAD * ossl_crypto_thread_native_start(CRYPTO_THREAD_ROUTINE routine,
-                                           void *data, int joinable);
+CRYPTO_THREAD *ossl_crypto_thread_native_start(CRYPTO_THREAD_ROUTINE routine,
+    void *data, int joinable);
 int ossl_crypto_thread_native_spawn(CRYPTO_THREAD *thread);
 int ossl_crypto_thread_native_join(CRYPTO_THREAD *thread,
-                              CRYPTO_THREAD_RETVAL *retval);
+    CRYPTO_THREAD_RETVAL *retval);
 int ossl_crypto_thread_native_perform_join(CRYPTO_THREAD *thread,
-                                           CRYPTO_THREAD_RETVAL *retval);
+    CRYPTO_THREAD_RETVAL *retval);
 int ossl_crypto_thread_native_exit(void);
 int ossl_crypto_thread_native_is_self(CRYPTO_THREAD *thread);
 int ossl_crypto_thread_native_clean(CRYPTO_THREAD *thread);
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/time.h b/include/internal/time.h
index 140dc1f33881..2a54c491f16f 100644
--- a/include/internal/time.h
+++ b/include/internal/time.h
@@ -8,13 +8,13 @@
  */
 
 #ifndef OSSL_INTERNAL_TIME_H
-# define OSSL_INTERNAL_TIME_H
-# pragma once
+#define OSSL_INTERNAL_TIME_H
+#pragma once
 
-# include <openssl/e_os2.h>     /* uint64_t */
-# include "internal/e_os.h"
-# include "internal/e_winsock.h" /* for struct timeval */
-# include "internal/safe_math.h"
+#include <openssl/e_os2.h> /* uint64_t */
+#include "internal/e_os.h"
+#include "internal/e_winsock.h" /* for struct timeval */
+#include "internal/safe_math.h"
 
 /*
  * Internal type defining a time.
@@ -24,20 +24,20 @@
  * a range of 584 years roughly.
  */
 typedef struct {
-    uint64_t t;     /* Ticks since the epoch */
+    uint64_t t; /* Ticks since the epoch */
 } OSSL_TIME;
 
 /* The precision of times allows this many values per second */
-# define OSSL_TIME_SECOND ((uint64_t)1000000000)
+#define OSSL_TIME_SECOND ((uint64_t)1000000000)
 
 /* One millisecond. */
-# define OSSL_TIME_MS     (OSSL_TIME_SECOND / 1000)
+#define OSSL_TIME_MS (OSSL_TIME_SECOND / 1000)
 
 /* One microsecond. */
-# define OSSL_TIME_US     (OSSL_TIME_MS     / 1000)
+#define OSSL_TIME_US (OSSL_TIME_MS / 1000)
 
 /* One nanosecond. */
-# define OSSL_TIME_NS     (OSSL_TIME_US     / 1000)
+#define OSSL_TIME_NS (OSSL_TIME_US / 1000)
 
 #define ossl_seconds2time(s) ossl_ticks2time((s) * OSSL_TIME_SECOND)
 #define ossl_time2seconds(t) (ossl_time2ticks(t) / OSSL_TIME_SECOND)
@@ -55,7 +55,8 @@ OSSL_SAFE_MATH_UNSIGNED(time, uint64_t)
 
 /* Convert a tick count into a time */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_ticks2time(uint64_t ticks)
+    OSSL_TIME
+    ossl_ticks2time(uint64_t ticks)
 {
     OSSL_TIME r;
 
@@ -65,7 +66,8 @@ OSSL_TIME ossl_ticks2time(uint64_t ticks)
 
 /* Convert a time to a tick count */
 static ossl_unused ossl_inline
-uint64_t ossl_time2ticks(OSSL_TIME t)
+    uint64_t
+    ossl_time2ticks(OSSL_TIME t)
 {
     return t.t;
 }
@@ -75,21 +77,21 @@ OSSL_TIME ossl_time_now(void);
 
 /* The beginning and end of the time range */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_zero(void)
+    OSSL_TIME
+    ossl_time_zero(void)
 {
     return ossl_ticks2time(0);
 }
 
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_infinite(void)
+    OSSL_TIME
+    ossl_time_infinite(void)
 {
     return ossl_ticks2time(~(uint64_t)0);
 }
 
-
 /* Convert time to timeval */
-static ossl_unused ossl_inline
-struct timeval ossl_time_to_timeval(OSSL_TIME t)
+static ossl_unused ossl_inline struct timeval ossl_time_to_timeval(OSSL_TIME t)
 {
     struct timeval tv;
     int err = 0;
@@ -113,7 +115,8 @@ struct timeval ossl_time_to_timeval(OSSL_TIME t)
 
 /* Convert timeval to time */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_from_timeval(struct timeval tv)
+    OSSL_TIME
+    ossl_time_from_timeval(struct timeval tv)
 {
     OSSL_TIME t;
 
@@ -127,14 +130,16 @@ OSSL_TIME ossl_time_from_timeval(struct timeval tv)
 
 /* Convert OSSL_TIME to time_t */
 static ossl_unused ossl_inline
-time_t ossl_time_to_time_t(OSSL_TIME t)
+    time_t
+    ossl_time_to_time_t(OSSL_TIME t)
 {
     return (time_t)(t.t / OSSL_TIME_SECOND);
 }
 
 /* Convert time_t to OSSL_TIME */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_from_time_t(time_t t)
+    OSSL_TIME
+    ossl_time_from_time_t(time_t t)
 {
     OSSL_TIME ot;
 
@@ -144,8 +149,7 @@ OSSL_TIME ossl_time_from_time_t(time_t t)
 }
 
 /* Compare two time values, return -1 if less, 1 if greater and 0 if equal */
-static ossl_unused ossl_inline
-int ossl_time_compare(OSSL_TIME a, OSSL_TIME b)
+static ossl_unused ossl_inline int ossl_time_compare(OSSL_TIME a, OSSL_TIME b)
 {
     if (a.t > b.t)
         return 1;
@@ -155,21 +159,20 @@ int ossl_time_compare(OSSL_TIME a, OSSL_TIME b)
 }
 
 /* Returns true if an OSSL_TIME is ossl_time_zero(). */
-static ossl_unused ossl_inline
-int ossl_time_is_zero(OSSL_TIME t)
+static ossl_unused ossl_inline int ossl_time_is_zero(OSSL_TIME t)
 {
     return ossl_time_compare(t, ossl_time_zero()) == 0;
 }
 
 /* Returns true if an OSSL_TIME is ossl_time_infinite(). */
-static ossl_unused ossl_inline
-int ossl_time_is_infinite(OSSL_TIME t)
+static ossl_unused ossl_inline int ossl_time_is_infinite(OSSL_TIME t)
 {
     return ossl_time_compare(t, ossl_time_infinite()) == 0;
 }
 
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_add(OSSL_TIME a, OSSL_TIME b)
+    OSSL_TIME
+    ossl_time_add(OSSL_TIME a, OSSL_TIME b)
 {
     OSSL_TIME r;
     int err = 0;
@@ -179,7 +182,8 @@ OSSL_TIME ossl_time_add(OSSL_TIME a, OSSL_TIME b)
 }
 
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_subtract(OSSL_TIME a, OSSL_TIME b)
+    OSSL_TIME
+    ossl_time_subtract(OSSL_TIME a, OSSL_TIME b)
 {
     OSSL_TIME r;
     int err = 0;
@@ -190,14 +194,16 @@ OSSL_TIME ossl_time_subtract(OSSL_TIME a, OSSL_TIME b)
 
 /* Returns |a - b|. */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_abs_difference(OSSL_TIME a, OSSL_TIME b)
+    OSSL_TIME
+    ossl_time_abs_difference(OSSL_TIME a, OSSL_TIME b)
 {
     return a.t > b.t ? ossl_time_subtract(a, b)
                      : ossl_time_subtract(b, a);
 }
 
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_multiply(OSSL_TIME a, uint64_t b)
+    OSSL_TIME
+    ossl_time_multiply(OSSL_TIME a, uint64_t b)
 {
     OSSL_TIME r;
     int err = 0;
@@ -207,7 +213,8 @@ OSSL_TIME ossl_time_multiply(OSSL_TIME a, uint64_t b)
 }
 
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_divide(OSSL_TIME a, uint64_t b)
+    OSSL_TIME
+    ossl_time_divide(OSSL_TIME a, uint64_t b)
 {
     OSSL_TIME r;
     int err = 0;
@@ -217,7 +224,8 @@ OSSL_TIME ossl_time_divide(OSSL_TIME a, uint64_t b)
 }
 
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_muldiv(OSSL_TIME a, uint64_t b, uint64_t c)
+    OSSL_TIME
+    ossl_time_muldiv(OSSL_TIME a, uint64_t b, uint64_t c)
 {
     OSSL_TIME r;
     int err = 0;
@@ -228,14 +236,16 @@ OSSL_TIME ossl_time_muldiv(OSSL_TIME a, uint64_t b, uint64_t c)
 
 /* Return higher of the two given time values. */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_max(OSSL_TIME a, OSSL_TIME b)
+    OSSL_TIME
+    ossl_time_max(OSSL_TIME a, OSSL_TIME b)
 {
     return a.t > b.t ? a : b;
 }
 
 /* Return the lower of the two given time values. */
 static ossl_unused ossl_inline
-OSSL_TIME ossl_time_min(OSSL_TIME a, OSSL_TIME b)
+    OSSL_TIME
+    ossl_time_min(OSSL_TIME a, OSSL_TIME b)
 {
     return a.t < b.t ? a : b;
 }
diff --git a/include/internal/tlsgroups.h b/include/internal/tlsgroups.h
index 14f2f47f76cd..1fd41993ea79 100644
--- a/include/internal/tlsgroups.h
+++ b/include/internal/tlsgroups.h
@@ -8,59 +8,59 @@
  */
 
 #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_brainpoolP256r1_tls13 0x001F
-# define OSSL_TLS_GROUP_ID_brainpoolP384r1_tls13 0x0020
-# define OSSL_TLS_GROUP_ID_brainpoolP512r1_tls13 0x0021
-# define OSSL_TLS_GROUP_ID_gc256A           0x0022
-# define OSSL_TLS_GROUP_ID_gc256B           0x0023
-# define OSSL_TLS_GROUP_ID_gc256C           0x0024
-# define OSSL_TLS_GROUP_ID_gc256D           0x0025
-# define OSSL_TLS_GROUP_ID_gc512A           0x0026
-# define OSSL_TLS_GROUP_ID_gc512B           0x0027
-# define OSSL_TLS_GROUP_ID_gc512C           0x0028
-# 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_mlkem512         0x0200
-# define OSSL_TLS_GROUP_ID_mlkem768         0x0201
-# define OSSL_TLS_GROUP_ID_mlkem1024        0x0202
-# define OSSL_TLS_GROUP_ID_SecP256r1MLKEM768  0x11EB
-# define OSSL_TLS_GROUP_ID_X25519MLKEM768     0x11EC
-# define OSSL_TLS_GROUP_ID_SecP384r1MLKEM1024 0x11ED
+#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_brainpoolP256r1_tls13 0x001F
+#define OSSL_TLS_GROUP_ID_brainpoolP384r1_tls13 0x0020
+#define OSSL_TLS_GROUP_ID_brainpoolP512r1_tls13 0x0021
+#define OSSL_TLS_GROUP_ID_gc256A 0x0022
+#define OSSL_TLS_GROUP_ID_gc256B 0x0023
+#define OSSL_TLS_GROUP_ID_gc256C 0x0024
+#define OSSL_TLS_GROUP_ID_gc256D 0x0025
+#define OSSL_TLS_GROUP_ID_gc512A 0x0026
+#define OSSL_TLS_GROUP_ID_gc512B 0x0027
+#define OSSL_TLS_GROUP_ID_gc512C 0x0028
+#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_mlkem512 0x0200
+#define OSSL_TLS_GROUP_ID_mlkem768 0x0201
+#define OSSL_TLS_GROUP_ID_mlkem1024 0x0202
+#define OSSL_TLS_GROUP_ID_SecP256r1MLKEM768 0x11EB
+#define OSSL_TLS_GROUP_ID_X25519MLKEM768 0x11EC
+#define OSSL_TLS_GROUP_ID_SecP384r1MLKEM1024 0x11ED
 
 #endif
diff --git a/include/internal/to_hex.h b/include/internal/to_hex.h
index e37e9f0b4390..36f4671c66b9 100644
--- a/include/internal/to_hex.h
+++ b/include/internal/to_hex.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OSSL_INTERNAL_TO_HEX_H
-# define OSSL_INTERNAL_TO_HEX_H
-# pragma once
+#define OSSL_INTERNAL_TO_HEX_H
+#pragma once
 
 static ossl_inline size_t to_hex(char *buf, uint8_t n, const char hexdig[17])
 {
diff --git a/include/internal/tsan_assist.h b/include/internal/tsan_assist.h
index a840df0b24ce..87dbaba78f12 100644
--- a/include/internal/tsan_assist.h
+++ b/include/internal/tsan_assist.h
@@ -48,38 +48,37 @@
  */
 
 #ifndef OSSL_INTERNAL_TSAN_ASSIST_H
-# define OSSL_INTERNAL_TSAN_ASSIST_H
-# pragma once
+#define OSSL_INTERNAL_TSAN_ASSIST_H
+#pragma once
 
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
+#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_add(ptr, n) atomic_fetch_add_explicit((ptr), (n), 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_add(ptr, n) atomic_fetch_add_explicit((ptr), (n), 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)
+#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_add(ptr, n) __atomic_fetch_add((ptr), (n), __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_add(ptr, n) __atomic_fetch_add((ptr), (n), __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
@@ -91,63 +90,63 @@
  * 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_add(ptr, n) (sizeof(*(ptr)) == 8 ? _InterlockedExchangeAdd64((ptr), (n)) \
-                                                : _InterlockedExchangeAdd((ptr), (n)))
-#  else
-#   define tsan_add(ptr, n) _InterlockedExchangeAdd((ptr), (n))
-#  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_add(ptr, n) (sizeof(*(ptr)) == 8 ? _InterlockedExchangeAdd64((ptr), (n)) \
+                                              : _InterlockedExchangeAdd((ptr), (n)))
+#else
+#define tsan_add(ptr, n) _InterlockedExchangeAdd((ptr), (n))
+#endif
+#if !defined(_ISO_VOLATILE)
+#define tsan_ld_acq(ptr) (*(ptr))
+#define tsan_st_rel(ptr, val) (*(ptr) = (val))
+#endif
 
-# endif
+#endif
 
-# ifndef TSAN_QUALIFIER
+#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_add(ptr, n) (*(ptr) += (n))
+#define tsan_load(ptr) (*(ptr))
+#define tsan_store(ptr, val) (*(ptr) = (val))
+#define tsan_add(ptr, n) (*(ptr) += (n))
 /*
  * 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
  * protected with #ifdef tsan_ld_acq with locked fallback.
  */
 
-# endif
+#endif
 
-# define tsan_counter(ptr) tsan_add((ptr), 1)
-# define tsan_decr(ptr) tsan_add((ptr), -1)
+#define tsan_counter(ptr) tsan_add((ptr), 1)
+#define tsan_decr(ptr) tsan_add((ptr), -1)
 
 #endif
diff --git a/include/internal/uint_set.h b/include/internal/uint_set.h
index dcb29b33f3cc..fd8ba4b6afa3 100644
--- a/include/internal/uint_set.h
+++ b/include/internal/uint_set.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 #ifndef OSSL_UINT_SET_H
-# define OSSL_UINT_SET_H
+#define OSSL_UINT_SET_H
 
 #include "openssl/params.h"
 #include "internal/list.h"
@@ -25,13 +25,13 @@
  * Discussion of implementation details can be found in uint_set.c.
  */
 typedef struct uint_range_st {
-    uint64_t    start, end;
+    uint64_t start, end;
 } UINT_RANGE;
 
 typedef struct uint_set_item_st UINT_SET_ITEM;
 struct uint_set_item_st {
     OSSL_LIST_MEMBER(uint_set, UINT_SET_ITEM);
-    UINT_RANGE                  range;
+    UINT_RANGE range;
 };
 
 DEFINE_LIST_OF(uint_set, UINT_SET_ITEM);
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,
diff --git a/include/openssl/aes.h b/include/openssl/aes.h
index d0f9dfc6f1cd..2b6c68398826 100644
--- a/include/openssl/aes.h
+++ b/include/openssl/aes.h
@@ -8,104 +8,102 @@
  */
 
 #ifndef OPENSSL_AES_H
-# define OPENSSL_AES_H
-# pragma once
+#define OPENSSL_AES_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_AES_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_AES_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <stddef.h>
-# ifdef  __cplusplus
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
-# endif
-
-# define AES_BLOCK_SIZE 16
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#define AES_BLOCK_SIZE 16
 
-#  define AES_ENCRYPT     1
-#  define AES_DECRYPT     0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
-#  define AES_MAXNR 14
+#define AES_ENCRYPT 1
+#define AES_DECRYPT 0
 
+#define AES_MAXNR 14
 
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
-#  ifdef AES_LONG
+#ifdef AES_LONG
     unsigned long rd_key[4 * (AES_MAXNR + 1)];
-#  else
+#else
     unsigned int rd_key[4 * (AES_MAXNR + 1)];
-#  endif
+#endif
     int rounds;
 };
 typedef struct aes_key_st AES_KEY;
 
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *AES_options(void);
 OSSL_DEPRECATEDIN_3_0
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
+    AES_KEY *key);
 OSSL_DEPRECATEDIN_3_0
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
+    AES_KEY *key);
 OSSL_DEPRECATEDIN_3_0
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
+    const AES_KEY *key);
 OSSL_DEPRECATEDIN_3_0
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
+    const AES_KEY *key);
 OSSL_DEPRECATEDIN_3_0
 void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     const AES_KEY *key, const int enc);
+    const AES_KEY *key, const int enc);
 OSSL_DEPRECATEDIN_3_0
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, const int enc);
 OSSL_DEPRECATEDIN_3_0
 void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, int *num, const int enc);
 OSSL_DEPRECATEDIN_3_0
 void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, int *num, const int enc);
 OSSL_DEPRECATEDIN_3_0
 void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, int *num, const int enc);
 OSSL_DEPRECATEDIN_3_0
 void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, int *num);
 
 /* NB: the IV is _two_ blocks long */
 OSSL_DEPRECATEDIN_3_0
 void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key,
+    unsigned char *ivec, const int enc);
 /* NB: the IV is _four_ blocks long */
 OSSL_DEPRECATEDIN_3_0
 void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key, const AES_KEY *key2,
-                        const unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, const AES_KEY *key2,
+    const unsigned char *ivec, const int enc);
 OSSL_DEPRECATEDIN_3_0
 int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-                 unsigned char *out, const unsigned char *in,
-                 unsigned int inlen);
+    unsigned char *out, const unsigned char *in,
+    unsigned int inlen);
 OSSL_DEPRECATEDIN_3_0
 int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-                   unsigned char *out, const unsigned char *in,
-                   unsigned int inlen);
-# endif
-
+    unsigned char *out, const unsigned char *in,
+    unsigned int inlen);
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/asn1.h.in b/include/openssl/asn1.h.in
index 68391c73a1f9..fd1fb05a1c90 100644
--- a/include/openssl/asn1.h.in
+++ b/include/openssl/asn1.h.in
@@ -9,85 +9,87 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_ASN1_H
-# define OPENSSL_ASN1_H
-# pragma once
+#define OPENSSL_ASN1_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ASN1_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ASN1_H
+#endif
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <time.h>
-# include <openssl/e_os2.h>
-# include <openssl/opensslconf.h>
-# include <openssl/bio.h>
-# include <openssl/safestack.h>
-# include <openssl/asn1err.h>
-# include <openssl/symhacks.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#include <time.h>
+#include <openssl/e_os2.h>
+#include <openssl/opensslconf.h>
+#include <openssl/bio.h>
+#include <openssl/safestack.h>
+#include <openssl/asn1err.h>
+#include <openssl/symhacks.h>
 
-# include <openssl/types.h>
-# include <openssl/bn.h>
+#include <openssl/types.h>
+#include <openssl/bn.h>
 
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+#undef OPENSSL_EXTERN
+#define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define V_ASN1_UNIVERSAL                0x00
-# define V_ASN1_APPLICATION              0x40
-# define V_ASN1_CONTEXT_SPECIFIC         0x80
-# define V_ASN1_PRIVATE                  0xc0
+#define V_ASN1_UNIVERSAL 0x00
+#define V_ASN1_APPLICATION 0x40
+#define V_ASN1_CONTEXT_SPECIFIC 0x80
+#define V_ASN1_PRIVATE 0xc0
 
-# define V_ASN1_CONSTRUCTED              0x20
-# define V_ASN1_PRIMITIVE_TAG            0x1f
-# define V_ASN1_PRIMATIVE_TAG /*compat*/ V_ASN1_PRIMITIVE_TAG
+#define V_ASN1_CONSTRUCTED 0x20
+#define V_ASN1_PRIMITIVE_TAG 0x1f
+#define V_ASN1_PRIMATIVE_TAG /*compat*/ V_ASN1_PRIMITIVE_TAG
 
-# define V_ASN1_APP_CHOOSE               -2 /* let the recipient choose */
-# define V_ASN1_OTHER                    -3 /* used in ASN1_TYPE */
-# define V_ASN1_ANY                      -4 /* used in ASN1 template code */
+#define V_ASN1_APP_CHOOSE -2 /* let the recipient choose */
+#define V_ASN1_OTHER -3 /* used in ASN1_TYPE */
+#define V_ASN1_ANY -4 /* used in ASN1 template code */
 
-# define V_ASN1_UNDEF                    -1
+#define V_ASN1_UNDEF -1
 /* ASN.1 tag values */
-# define V_ASN1_EOC                      0
-# define V_ASN1_BOOLEAN                  1
-# define V_ASN1_INTEGER                  2
-# define V_ASN1_BIT_STRING               3
-# define V_ASN1_OCTET_STRING             4
-# define V_ASN1_NULL                     5
-# define V_ASN1_OBJECT                   6
-# define V_ASN1_OBJECT_DESCRIPTOR        7
-# define V_ASN1_EXTERNAL                 8
-# define V_ASN1_REAL                     9
-# define V_ASN1_ENUMERATED               10
-# define V_ASN1_UTF8STRING               12
-# define V_ASN1_SEQUENCE                 16
-# define V_ASN1_SET                      17
-# define V_ASN1_NUMERICSTRING            18
-# define V_ASN1_PRINTABLESTRING          19
-# define V_ASN1_T61STRING                20
-# define V_ASN1_TELETEXSTRING            20 /* alias */
-# define V_ASN1_VIDEOTEXSTRING           21
-# define V_ASN1_IA5STRING                22
-# define V_ASN1_UTCTIME                  23
-# define V_ASN1_GENERALIZEDTIME          24
-# define V_ASN1_GRAPHICSTRING            25
-# define V_ASN1_ISO64STRING              26
-# define V_ASN1_VISIBLESTRING            26 /* alias */
-# define V_ASN1_GENERALSTRING            27
-# define V_ASN1_UNIVERSALSTRING          28
-# define V_ASN1_BMPSTRING                30
+#define V_ASN1_EOC 0
+#define V_ASN1_BOOLEAN 1
+#define V_ASN1_INTEGER 2
+#define V_ASN1_BIT_STRING 3
+#define V_ASN1_OCTET_STRING 4
+#define V_ASN1_NULL 5
+#define V_ASN1_OBJECT 6
+#define V_ASN1_OBJECT_DESCRIPTOR 7
+#define V_ASN1_EXTERNAL 8
+#define V_ASN1_REAL 9
+#define V_ASN1_ENUMERATED 10
+#define V_ASN1_UTF8STRING 12
+#define V_ASN1_SEQUENCE 16
+#define V_ASN1_SET 17
+#define V_ASN1_NUMERICSTRING 18
+#define V_ASN1_PRINTABLESTRING 19
+#define V_ASN1_T61STRING 20
+#define V_ASN1_TELETEXSTRING 20 /* alias */
+#define V_ASN1_VIDEOTEXSTRING 21
+#define V_ASN1_IA5STRING 22
+#define V_ASN1_UTCTIME 23
+#define V_ASN1_GENERALIZEDTIME 24
+#define V_ASN1_GRAPHICSTRING 25
+#define V_ASN1_ISO64STRING 26
+#define V_ASN1_VISIBLESTRING 26 /* alias */
+#define V_ASN1_GENERALSTRING 27
+#define V_ASN1_UNIVERSALSTRING 28
+#define V_ASN1_BMPSTRING 30
 
 /*
  * NB the constants below are used internally by ASN1_INTEGER
@@ -95,53 +97,54 @@ extern "C" {
  * the wire tag values.
  */
 
-# define V_ASN1_NEG                      0x100
-# define V_ASN1_NEG_INTEGER              (2 | V_ASN1_NEG)
-# define V_ASN1_NEG_ENUMERATED           (10 | V_ASN1_NEG)
+#define V_ASN1_NEG 0x100
+#define V_ASN1_NEG_INTEGER (2 | V_ASN1_NEG)
+#define V_ASN1_NEG_ENUMERATED (10 | V_ASN1_NEG)
 
 /* For use with d2i_ASN1_type_bytes() */
-# define B_ASN1_NUMERICSTRING    0x0001
-# define B_ASN1_PRINTABLESTRING  0x0002
-# define B_ASN1_T61STRING        0x0004
-# define B_ASN1_TELETEXSTRING    0x0004
-# define B_ASN1_VIDEOTEXSTRING   0x0008
-# define B_ASN1_IA5STRING        0x0010
-# define B_ASN1_GRAPHICSTRING    0x0020
-# define B_ASN1_ISO64STRING      0x0040
-# define B_ASN1_VISIBLESTRING    0x0040
-# define B_ASN1_GENERALSTRING    0x0080
-# define B_ASN1_UNIVERSALSTRING  0x0100
-# define B_ASN1_OCTET_STRING     0x0200
-# define B_ASN1_BIT_STRING       0x0400
-# define B_ASN1_BMPSTRING        0x0800
-# define B_ASN1_UNKNOWN          0x1000
-# define B_ASN1_UTF8STRING       0x2000
-# define B_ASN1_UTCTIME          0x4000
-# define B_ASN1_GENERALIZEDTIME  0x8000
-# define B_ASN1_SEQUENCE         0x10000
+#define B_ASN1_NUMERICSTRING 0x0001
+#define B_ASN1_PRINTABLESTRING 0x0002
+#define B_ASN1_T61STRING 0x0004
+#define B_ASN1_TELETEXSTRING 0x0004
+#define B_ASN1_VIDEOTEXSTRING 0x0008
+#define B_ASN1_IA5STRING 0x0010
+#define B_ASN1_GRAPHICSTRING 0x0020
+#define B_ASN1_ISO64STRING 0x0040
+#define B_ASN1_VISIBLESTRING 0x0040
+#define B_ASN1_GENERALSTRING 0x0080
+#define B_ASN1_UNIVERSALSTRING 0x0100
+#define B_ASN1_OCTET_STRING 0x0200
+#define B_ASN1_BIT_STRING 0x0400
+#define B_ASN1_BMPSTRING 0x0800
+#define B_ASN1_UNKNOWN 0x1000
+#define B_ASN1_UTF8STRING 0x2000
+#define B_ASN1_UTCTIME 0x4000
+#define B_ASN1_GENERALIZEDTIME 0x8000
+#define B_ASN1_SEQUENCE 0x10000
 /* For use with ASN1_mbstring_copy() */
-# define MBSTRING_FLAG           0x1000
-# define MBSTRING_UTF8           (MBSTRING_FLAG)
-# define MBSTRING_ASC            (MBSTRING_FLAG|1)
-# define MBSTRING_BMP            (MBSTRING_FLAG|2)
-# define MBSTRING_UNIV           (MBSTRING_FLAG|4)
-# define SMIME_OLDMIME           0x400
-# define SMIME_CRLFEOL           0x800
-# define SMIME_STREAM            0x1000
+#define MBSTRING_FLAG 0x1000
+#define MBSTRING_UTF8 (MBSTRING_FLAG)
+#define MBSTRING_ASC (MBSTRING_FLAG | 1)
+#define MBSTRING_BMP (MBSTRING_FLAG | 2)
+#define MBSTRING_UNIV (MBSTRING_FLAG | 4)
+#define SMIME_OLDMIME 0x400
+#define SMIME_CRLFEOL 0x800
+#define SMIME_STREAM 0x1000
 
 /* Stacks for types not otherwise defined in this header */
+/* clang-format off */
 {-
     generate_stack_macros("X509_ALGOR");
 -}
+/* clang-format on */
 
-
-# define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
+#define ASN1_STRING_FLAG_BITS_LEFT 0x08 /* Set if 0x07 has bits left value */
 /*
  * This indicates that the ASN1_STRING is not a real value but just a place
  * holder for the location where indefinite length constructed data should be
  * inserted in the memory buffer
  */
-# define ASN1_STRING_FLAG_NDEF 0x010
+#define ASN1_STRING_FLAG_NDEF 0x010
 
 /*
  * This flag is used by the CMS code to indicate that a string is not
@@ -149,16 +152,16 @@ extern "C" {
  * The flag will be reset when content has been written to it.
  */
 
-# define ASN1_STRING_FLAG_CONT 0x020
+#define ASN1_STRING_FLAG_CONT 0x020
 /*
  * This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING
  * type.
  */
-# define ASN1_STRING_FLAG_MSTRING 0x040
+#define ASN1_STRING_FLAG_MSTRING 0x040
 /* String is embedded and only content should be freed */
-# define ASN1_STRING_FLAG_EMBED 0x080
+#define ASN1_STRING_FLAG_EMBED 0x080
 /* String should be parsed in RFC 5280's time format */
-# define ASN1_STRING_FLAG_X509_TIME 0x100
+#define ASN1_STRING_FLAG_X509_TIME 0x100
 /* This is the base type that holds just about everything :-) */
 struct asn1_string_st {
     int length;
@@ -179,26 +182,26 @@ struct asn1_string_st {
  */
 
 typedef struct ASN1_ENCODING_st {
-    unsigned char *enc;         /* DER encoding */
-    long len;                   /* Length of encoding */
-    int modified;               /* set to 1 if 'enc' is invalid */
+    unsigned char *enc; /* DER encoding */
+    long len; /* Length of encoding */
+    int modified; /* set to 1 if 'enc' is invalid */
 } ASN1_ENCODING;
 
 /* Used with ASN1 LONG type: if a long is set to this it is omitted */
-# define ASN1_LONG_UNDEF 0x7fffffffL
+#define ASN1_LONG_UNDEF 0x7fffffffL
 
-# define STABLE_FLAGS_MALLOC     0x01
+#define STABLE_FLAGS_MALLOC 0x01
 /*
  * A zero passed to ASN1_STRING_TABLE_new_add for the flags is interpreted
  * as "don't change" and STABLE_FLAGS_MALLOC is always set. By setting
  * STABLE_FLAGS_MALLOC only we can clear the existing value. Use the alias
  * STABLE_FLAGS_CLEAR to reflect this.
  */
-# define STABLE_FLAGS_CLEAR      STABLE_FLAGS_MALLOC
-# define STABLE_NO_MASK          0x02
-# define DIRSTRING_TYPE  \
- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
-# define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
+#define STABLE_FLAGS_CLEAR STABLE_FLAGS_MALLOC
+#define STABLE_NO_MASK 0x02
+#define DIRSTRING_TYPE \
+    (B_ASN1_PRINTABLESTRING | B_ASN1_T61STRING | B_ASN1_BMPSTRING | B_ASN1_UTF8STRING)
+#define PKCS9STRING_TYPE (DIRSTRING_TYPE | B_ASN1_IA5STRING)
 
 struct asn1_string_table_st {
     int nid;
@@ -208,20 +211,22 @@ struct asn1_string_table_st {
     unsigned long flags;
 };
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_STRING_TABLE");
 -}
+/* clang-format on */
 
 /* size limits: this stuff is taken straight from RFC2459 */
 
-# define ub_name                         32768
-# define ub_common_name                  64
-# define ub_locality_name                128
-# define ub_state_name                   128
-# define ub_organization_name            64
-# define ub_organization_unit_name       64
-# define ub_title                        64
-# define ub_email_address                128
+#define ub_name 32768
+#define ub_common_name 64
+#define ub_locality_name 128
+#define ub_state_name 128
+#define ub_organization_name 64
+#define ub_organization_unit_name 64
+#define ub_title 64
+#define ub_email_address 128
 
 /*
  * Declarations for template structures: for full definitions see asn1t.h
@@ -239,88 +244,90 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
  * arguments in macro calls.
  */
 
-# define DECLARE_ASN1_FUNCTIONS_attr(attr, type)                            \
+#define DECLARE_ASN1_FUNCTIONS_attr(attr, type) \
     DECLARE_ASN1_FUNCTIONS_name_attr(attr, type, type)
-# define DECLARE_ASN1_FUNCTIONS(type)                                       \
+#define DECLARE_ASN1_FUNCTIONS(type) \
     DECLARE_ASN1_FUNCTIONS_attr(extern, type)
 
-# define DECLARE_ASN1_ALLOC_FUNCTIONS_attr(attr, type)                      \
+#define DECLARE_ASN1_ALLOC_FUNCTIONS_attr(attr, type) \
     DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr(attr, type, type)
-# define DECLARE_ASN1_ALLOC_FUNCTIONS(type)                                 \
+#define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
     DECLARE_ASN1_ALLOC_FUNCTIONS_attr(extern, type)
 
-# define DECLARE_ASN1_FUNCTIONS_name_attr(attr, type, name)                 \
-    DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr(attr, type, name)                \
+#define DECLARE_ASN1_FUNCTIONS_name_attr(attr, type, name)   \
+    DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr(attr, type, name) \
     DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr(attr, type, name)
-# define DECLARE_ASN1_FUNCTIONS_name(type, name)                            \
+#define DECLARE_ASN1_FUNCTIONS_name(type, name) \
     DECLARE_ASN1_FUNCTIONS_name_attr(extern, type, name)
 
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_attr(attr, type, itname, name)       \
-    DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(attr, type, name)               \
+#define DECLARE_ASN1_ENCODE_FUNCTIONS_attr(attr, type, itname, name) \
+    DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(attr, type, name)        \
     DECLARE_ASN1_ITEM_attr(attr, itname)
-# define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)                  \
+#define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
     DECLARE_ASN1_ENCODE_FUNCTIONS_attr(extern, type, itname, name)
 
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr(attr, type, name)          \
+#define DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr(attr, type, name) \
     DECLARE_ASN1_ENCODE_FUNCTIONS_attr(attr, type, name, name)
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_name(type, name) \
+#define DECLARE_ASN1_ENCODE_FUNCTIONS_name(type, name) \
     DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr(extern, type, name)
 
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(attr, type, name)          \
-    attr type *d2i_##name(type **a, const unsigned char **in, long len);    \
+#define DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(attr, type, name)        \
+    attr type *d2i_##name(type **a, const unsigned char **in, long len); \
     attr int i2d_##name(const type *a, unsigned char **out);
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_only(type, name)                     \
+#define DECLARE_ASN1_ENCODE_FUNCTIONS_only(type, name) \
     DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(extern, type, name)
 
-# define DECLARE_ASN1_NDEF_FUNCTION_attr(attr, name)                        \
+#define DECLARE_ASN1_NDEF_FUNCTION_attr(attr, name) \
     attr int i2d_##name##_NDEF(const name *a, unsigned char **out);
-# define DECLARE_ASN1_NDEF_FUNCTION(name)                                   \
+#define DECLARE_ASN1_NDEF_FUNCTION(name) \
     DECLARE_ASN1_NDEF_FUNCTION_attr(extern, name)
 
-# define DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr(attr, type, name)           \
-    attr type *name##_new(void);                                            \
+#define DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr(attr, type, name) \
+    attr type *name##_new(void);                                 \
     attr void name##_free(type *a);
-# define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name)                      \
+#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
     DECLARE_ASN1_ALLOC_FUNCTIONS_name_attr(extern, type, name)
 
-# define DECLARE_ASN1_DUP_FUNCTION_attr(attr, type)                         \
+#define DECLARE_ASN1_DUP_FUNCTION_attr(attr, type) \
     DECLARE_ASN1_DUP_FUNCTION_name_attr(attr, type, type)
-# define DECLARE_ASN1_DUP_FUNCTION(type)                                    \
+#define DECLARE_ASN1_DUP_FUNCTION(type) \
     DECLARE_ASN1_DUP_FUNCTION_attr(extern, type)
 
-# define DECLARE_ASN1_DUP_FUNCTION_name_attr(attr, type, name)              \
+#define DECLARE_ASN1_DUP_FUNCTION_name_attr(attr, type, name) \
     attr type *name##_dup(const type *a);
-# define DECLARE_ASN1_DUP_FUNCTION_name(type, name)                         \
+#define DECLARE_ASN1_DUP_FUNCTION_name(type, name) \
     DECLARE_ASN1_DUP_FUNCTION_name_attr(extern, type, name)
 
-# define DECLARE_ASN1_PRINT_FUNCTION_attr(attr, stname)                     \
+#define DECLARE_ASN1_PRINT_FUNCTION_attr(attr, stname) \
     DECLARE_ASN1_PRINT_FUNCTION_fname_attr(attr, stname, stname)
-# define DECLARE_ASN1_PRINT_FUNCTION(stname)                                \
+#define DECLARE_ASN1_PRINT_FUNCTION(stname) \
     DECLARE_ASN1_PRINT_FUNCTION_attr(extern, stname)
 
-# define DECLARE_ASN1_PRINT_FUNCTION_fname_attr(attr, stname, fname)        \
-    attr int fname##_print_ctx(BIO *out, const stname *x, int indent,       \
-                               const ASN1_PCTX *pctx);
-# define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname)                   \
+#define DECLARE_ASN1_PRINT_FUNCTION_fname_attr(attr, stname, fname)   \
+    attr int fname##_print_ctx(BIO *out, const stname *x, int indent, \
+        const ASN1_PCTX *pctx);
+#define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
     DECLARE_ASN1_PRINT_FUNCTION_fname_attr(extern, stname, fname)
 
-# define D2I_OF(type) type *(*)(type **,const unsigned char **,long)
-# define I2D_OF(type) int (*)(const type *,unsigned char **)
+#define D2I_OF(type) type *(*)(type **, const unsigned char **, long)
+#define I2D_OF(type) int (*)(const type *, unsigned char **)
 
-# define CHECKED_D2I_OF(type, d2i) \
-    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
-# define CHECKED_I2D_OF(type, i2d) \
-    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
-# define CHECKED_NEW_OF(type, xnew) \
-    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
-# define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-# define CHECKED_PPTR_OF(type, p) \
-    ((void**) (1 ? p : (type**)0))
+#define CHECKED_D2I_OF(type, d2i) \
+    ((d2i_of_void *)(1 ? d2i : ((D2I_OF(type))0)))
+#define CHECKED_I2D_OF(type, i2d) \
+    ((i2d_of_void *)(1 ? i2d : ((I2D_OF(type))0)))
+#define CHECKED_NEW_OF(type, xnew) \
+    ((void *(*)(void))(1 ? xnew : ((type * (*)(void))0)))
+#define CHECKED_PTR_OF(type, p) \
+    ((void *)(1 ? p : (type *)0))
+#define CHECKED_PPTR_OF(type, p) \
+    ((void **)(1 ? p : (type **)0))
 
-# define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
-# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(const type *,unsigned char **)
-# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
+#define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **, const unsigned char **, long)
+#define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(const type *, unsigned char **)
+#define TYPEDEF_D2I2D_OF(type) \
+    TYPEDEF_D2I_OF(type);      \
+    TYPEDEF_I2D_OF(type)
 
 typedef void *d2i_of_void(void **, const unsigned char **, long);
 typedef int i2d_of_void(const void *, unsigned char **);
@@ -362,26 +369,25 @@ typedef int OSSL_i2d_of_void_ctx(const void *, unsigned char **, void *vctx);
  *
  */
 
-
 /*
  * Platforms that can't easily handle shared global variables are declared as
  * functions returning ASN1_ITEM pointers.
  */
 
 /* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
+typedef const ASN1_ITEM *ASN1_ITEM_EXP(void);
 
 /* Macro to obtain ASN1_ITEM pointer from exported type */
-# define ASN1_ITEM_ptr(iptr) (iptr())
+#define ASN1_ITEM_ptr(iptr) (iptr())
 
 /* Macro to include ASN1_ITEM pointer from base type */
-# define ASN1_ITEM_ref(iptr) (iptr##_it)
+#define ASN1_ITEM_ref(iptr) (iptr##_it)
 
-# define ASN1_ITEM_rptr(ref) (ref##_it())
+#define ASN1_ITEM_rptr(ref) (ref##_it())
 
-# define DECLARE_ASN1_ITEM_attr(attr, name)                                 \
-    attr const ASN1_ITEM * name##_it(void);
-# define DECLARE_ASN1_ITEM(name)                                            \
+#define DECLARE_ASN1_ITEM_attr(attr, name) \
+    attr const ASN1_ITEM *name##_it(void);
+#define DECLARE_ASN1_ITEM(name) \
     DECLARE_ASN1_ITEM_attr(extern, name)
 
 /* Parameters used by ASN1_STRING_print_ex() */
@@ -391,30 +397,30 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
  * control characters and MSB set characters
  */
 
-# define ASN1_STRFLGS_ESC_2253           1
-# define ASN1_STRFLGS_ESC_CTRL           2
-# define ASN1_STRFLGS_ESC_MSB            4
+#define ASN1_STRFLGS_ESC_2253 1
+#define ASN1_STRFLGS_ESC_CTRL 2
+#define ASN1_STRFLGS_ESC_MSB 4
 
 /* Lower 8 bits are reserved as an output type specifier */
-# define ASN1_DTFLGS_TYPE_MASK    0x0FUL
-# define ASN1_DTFLGS_RFC822       0x00UL
-# define ASN1_DTFLGS_ISO8601      0x01UL
+#define ASN1_DTFLGS_TYPE_MASK 0x0FUL
+#define ASN1_DTFLGS_RFC822 0x00UL
+#define ASN1_DTFLGS_ISO8601 0x01UL
 
 /*
  * This flag determines how we do escaping: normally RC2253 backslash only,
  * set this to use backslash and quote.
  */
 
-# define ASN1_STRFLGS_ESC_QUOTE          8
+#define ASN1_STRFLGS_ESC_QUOTE 8
 
 /* These three flags are internal use only. */
 
 /* Character is a valid PrintableString character */
-# define CHARTYPE_PRINTABLESTRING        0x10
+#define CHARTYPE_PRINTABLESTRING 0x10
 /* Character needs escaping if it is the first character */
-# define CHARTYPE_FIRST_ESC_2253         0x20
+#define CHARTYPE_FIRST_ESC_2253 0x20
 /* Character needs escaping if it is the last character */
-# define CHARTYPE_LAST_ESC_2253          0x40
+#define CHARTYPE_LAST_ESC_2253 0x40
 
 /*
  * NB the internal flags are safely reused below by flags handled at the top
@@ -425,7 +431,7 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
  * If this is set we convert all character strings to UTF8 first
  */
 
-# define ASN1_STRFLGS_UTF8_CONVERT       0x10
+#define ASN1_STRFLGS_UTF8_CONVERT 0x10
 
 /*
  * If this is set we don't attempt to interpret content: just assume all
@@ -433,10 +439,10 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
  * looking output!
  */
 
-# define ASN1_STRFLGS_IGNORE_TYPE        0x20
+#define ASN1_STRFLGS_IGNORE_TYPE 0x20
 
 /* If this is set we include the string type in the output */
-# define ASN1_STRFLGS_SHOW_TYPE          0x40
+#define ASN1_STRFLGS_SHOW_TYPE 0x40
 
 /*
  * This determines which strings to display and which to 'dump' (hex dump of
@@ -446,33 +452,27 @@ typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
  * options.
  */
 
-# define ASN1_STRFLGS_DUMP_ALL           0x80
-# define ASN1_STRFLGS_DUMP_UNKNOWN       0x100
+#define ASN1_STRFLGS_DUMP_ALL 0x80
+#define ASN1_STRFLGS_DUMP_UNKNOWN 0x100
 
 /*
  * These determine what 'dumping' does, we can dump the content octets or the
  * DER encoding: both use the RFC2253 #XXXXX notation.
  */
 
-# define ASN1_STRFLGS_DUMP_DER           0x200
+#define ASN1_STRFLGS_DUMP_DER 0x200
 
 /*
  * This flag specifies that RC2254 escaping shall be performed.
  */
-#define ASN1_STRFLGS_ESC_2254           0x400
+#define ASN1_STRFLGS_ESC_2254 0x400
 
 /*
  * All the string flags consistent with RFC2253, escaping control characters
  * isn't essential in RFC2253 but it is advisable anyway.
  */
 
-# define ASN1_STRFLGS_RFC2253    (ASN1_STRFLGS_ESC_2253 | \
-                                ASN1_STRFLGS_ESC_CTRL | \
-                                ASN1_STRFLGS_ESC_MSB | \
-                                ASN1_STRFLGS_UTF8_CONVERT | \
-                                ASN1_STRFLGS_DUMP_UNKNOWN | \
-                                ASN1_STRFLGS_DUMP_DER)
-
+#define ASN1_STRFLGS_RFC2253 (ASN1_STRFLGS_ESC_2253 | ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB | ASN1_STRFLGS_UTF8_CONVERT | ASN1_STRFLGS_DUMP_UNKNOWN | ASN1_STRFLGS_DUMP_DER)
 
 struct asn1_type_st {
     int type;
@@ -505,9 +505,11 @@ struct asn1_type_st {
     } value;
 };
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_TYPE");
 -}
+/* clang-format on */
 
 typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
 
@@ -521,34 +523,17 @@ typedef struct BIT_STRING_BITNAME_st {
     const char *sname;
 } BIT_STRING_BITNAME;
 
-# define B_ASN1_TIME \
-                        B_ASN1_UTCTIME | \
-                        B_ASN1_GENERALIZEDTIME
+#define B_ASN1_TIME \
+    B_ASN1_UTCTIME | B_ASN1_GENERALIZEDTIME
 
-# define B_ASN1_PRINTABLE \
-                        B_ASN1_NUMERICSTRING| \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_T61STRING| \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_BIT_STRING| \
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING|\
-                        B_ASN1_SEQUENCE|\
-                        B_ASN1_UNKNOWN
+#define B_ASN1_PRINTABLE \
+    B_ASN1_NUMERICSTRING | B_ASN1_PRINTABLESTRING | B_ASN1_T61STRING | B_ASN1_IA5STRING | B_ASN1_BIT_STRING | B_ASN1_UNIVERSALSTRING | B_ASN1_BMPSTRING | B_ASN1_UTF8STRING | B_ASN1_SEQUENCE | B_ASN1_UNKNOWN
 
-# define B_ASN1_DIRECTORYSTRING \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_TELETEXSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_UTF8STRING
+#define B_ASN1_DIRECTORYSTRING \
+    B_ASN1_PRINTABLESTRING | B_ASN1_TELETEXSTRING | B_ASN1_BMPSTRING | B_ASN1_UNIVERSALSTRING | B_ASN1_UTF8STRING
 
-# define B_ASN1_DISPLAYTEXT \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_VISIBLESTRING| \
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING
+#define B_ASN1_DISPLAYTEXT \
+    B_ASN1_IA5STRING | B_ASN1_VISIBLESTRING | B_ASN1_BMPSTRING | B_ASN1_UTF8STRING
 
 DECLARE_ASN1_ALLOC_FUNCTIONS_name(ASN1_TYPE, ASN1_TYPE)
 DECLARE_ASN1_ENCODE_FUNCTIONS(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
@@ -561,9 +546,11 @@ int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
 ASN1_TYPE *ASN1_TYPE_pack_sequence(const ASN1_ITEM *it, void *s, ASN1_TYPE **t);
 void *ASN1_TYPE_unpack_sequence(const ASN1_ITEM *it, const ASN1_TYPE *t);
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_OBJECT");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_FUNCTIONS(ASN1_OBJECT)
 
@@ -574,20 +561,20 @@ int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
 DECLARE_ASN1_DUP_FUNCTION(ASN1_STRING)
 ASN1_STRING *ASN1_STRING_type_new(int type);
 int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
-  /*
-   * Since this is used to store all sorts of things, via macros, for now,
-   * make its data void *
-   */
+/*
+ * Since this is used to store all sorts of things, via macros, for now,
+ * make its data void *
+ */
 int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
 void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
 int ASN1_STRING_length(const ASN1_STRING *x);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 void ASN1_STRING_length_set(ASN1_STRING *x, int n);
-# endif
+#endif
 int ASN1_STRING_type(const ASN1_STRING *x);
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 unsigned char *ASN1_STRING_data(ASN1_STRING *x);
-# endif
+#endif
 const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x);
 
 DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
@@ -595,22 +582,23 @@ int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);
 int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
 int ASN1_BIT_STRING_get_bit(const ASN1_BIT_STRING *a, int n);
 int ASN1_BIT_STRING_check(const ASN1_BIT_STRING *a,
-                          const unsigned char *flags, int flags_len);
+    const unsigned char *flags, int flags_len);
 
 int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-                               BIT_STRING_BITNAME *tbl, int indent);
+    BIT_STRING_BITNAME *tbl, int indent);
 int ASN1_BIT_STRING_num_asc(const char *name, BIT_STRING_BITNAME *tbl);
 int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, const char *name, int value,
-                            BIT_STRING_BITNAME *tbl);
+    BIT_STRING_BITNAME *tbl);
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_INTEGER");
 -}
-
+/* clang-format on */
 
 DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
 ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                long length);
+    long length);
 DECLARE_ASN1_DUP_FUNCTION(ASN1_INTEGER)
 int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
 
@@ -619,31 +607,33 @@ DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)
 int ASN1_UTCTIME_check(const ASN1_UTCTIME *a);
 ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t);
 ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
-                               int offset_day, long offset_sec);
+    int offset_day, long offset_sec);
 int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
 int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
 
 int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *a);
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
-                                               time_t t);
+    time_t t);
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
-                                               time_t t, int offset_day,
-                                               long offset_sec);
+    time_t t, int offset_day,
+    long offset_sec);
 int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);
 
 int ASN1_TIME_diff(int *pday, int *psec,
-                   const ASN1_TIME *from, const ASN1_TIME *to);
+    const ASN1_TIME *from, const ASN1_TIME *to);
 
 DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
 DECLARE_ASN1_DUP_FUNCTION(ASN1_OCTET_STRING)
 int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
-                          const ASN1_OCTET_STRING *b);
+    const ASN1_OCTET_STRING *b);
 int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data,
-                          int len);
+    int len);
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_UTF8STRING");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
 DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
@@ -654,9 +644,11 @@ DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)
 int UTF8_getc(const unsigned char *str, int len, unsigned long *val);
 int UTF8_putc(unsigned char *str, int len, unsigned long value);
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_GENERALSTRING");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)
 
@@ -678,10 +670,10 @@ DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)
 
 ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
 ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
-                         int offset_day, long offset_sec);
+    int offset_day, long offset_sec);
 int ASN1_TIME_check(const ASN1_TIME *t);
 ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
-                                                   ASN1_GENERALIZEDTIME **out);
+    ASN1_GENERALIZEDTIME **out);
 int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
 int ASN1_TIME_set_string_X509(ASN1_TIME *s, const char *str);
 int ASN1_TIME_to_tm(const ASN1_TIME *s, struct tm *tm);
@@ -700,7 +692,7 @@ int i2t_ASN1_OBJECT(char *buf, int buf_len, const ASN1_OBJECT *a);
 
 int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);
 ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
-                                const char *sn, const char *ln);
+    const char *sn, const char *ln);
 
 int ASN1_INTEGER_get_int64(int64_t *pr, const ASN1_INTEGER *a);
 int ASN1_INTEGER_set_int64(ASN1_INTEGER *a, int64_t r);
@@ -715,7 +707,6 @@ BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn);
 int ASN1_ENUMERATED_get_int64(int64_t *pr, const ASN1_ENUMERATED *a);
 int ASN1_ENUMERATED_set_int64(ASN1_ENUMERATED *a, int64_t r);
 
-
 int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
 long ASN1_ENUMERATED_get(const ASN1_ENUMERATED *a);
 ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(const BIGNUM *bn, ASN1_ENUMERATED *ai);
@@ -729,81 +720,81 @@ unsigned long ASN1_tag2bit(int tag);
 
 /* SPECIALS */
 int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
-                    int *pclass, long omax);
+    int *pclass, long omax);
 int ASN1_check_infinite_end(unsigned char **p, long len);
 int ASN1_const_check_infinite_end(const unsigned char **p, long len);
 void ASN1_put_object(unsigned char **pp, int constructed, int length,
-                     int tag, int xclass);
+    int tag, int xclass);
 int ASN1_put_eoc(unsigned char **pp);
 int ASN1_object_size(int constructed, int length, int tag);
 
 /* Used to implement other functions */
 void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, const void *x);
 
-# define ASN1_dup_of(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(const type, x)))
+#define ASN1_dup_of(type, i2d, d2i, x)           \
+    ((type *)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
+        CHECKED_D2I_OF(type, d2i),               \
+        CHECKED_PTR_OF(const type, x)))
 
 void *ASN1_item_dup(const ASN1_ITEM *it, const void *x);
 int ASN1_item_sign_ex(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                      X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-                      const void *data, const ASN1_OCTET_STRING *id,
-                      EVP_PKEY *pkey, const EVP_MD *md, OSSL_LIB_CTX *libctx,
-                      const char *propq);
+    X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
+    const void *data, const ASN1_OCTET_STRING *id,
+    EVP_PKEY *pkey, const EVP_MD *md, OSSL_LIB_CTX *libctx,
+    const char *propq);
 int ASN1_item_verify_ex(const ASN1_ITEM *it, const X509_ALGOR *alg,
-                        const ASN1_BIT_STRING *signature, const void *data,
-                        const ASN1_OCTET_STRING *id, EVP_PKEY *pkey,
-                        OSSL_LIB_CTX *libctx, const char *propq);
+    const ASN1_BIT_STRING *signature, const void *data,
+    const ASN1_OCTET_STRING *id, EVP_PKEY *pkey,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 /* ASN1 alloc/free macros for when a type is only used internally */
 
-# define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
-# define M_ASN1_free_of(x, type) \
-                ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
+#define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
+#define M_ASN1_free_of(x, type) \
+    ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
 
-# ifndef OPENSSL_NO_STDIO
-void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x);
+#ifndef OPENSSL_NO_STDIO
+void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x);
 
-#  define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
-                        CHECKED_D2I_OF(type, d2i), \
-                        in, \
-                        CHECKED_PPTR_OF(type, x)))
+#define ASN1_d2i_fp_of(type, xnew, d2i, in, x)       \
+    ((type *)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
+        CHECKED_D2I_OF(type, d2i),                   \
+        in,                                          \
+        CHECKED_PPTR_OF(type, x)))
 
 void *ASN1_item_d2i_fp_ex(const ASN1_ITEM *it, FILE *in, void *x,
-                          OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
 int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, const void *x);
 
-#  define ASN1_i2d_fp_of(type,i2d,out,x) \
+#define ASN1_i2d_fp_of(type, i2d, out, x)   \
     (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(const type, x)))
+        out,                                \
+        CHECKED_PTR_OF(const type, x)))
 
 int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, const void *x);
 int ASN1_STRING_print_ex_fp(FILE *fp, const ASN1_STRING *str, unsigned long flags);
-# endif
+#endif
 
 int ASN1_STRING_to_UTF8(unsigned char **out, const ASN1_STRING *in);
 
-void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);
+void *ASN1_d2i_bio(void *(*xnew)(void), d2i_of_void *d2i, BIO *in, void **x);
 
-#  define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \
-                          CHECKED_D2I_OF(type, d2i), \
-                          in, \
-                          CHECKED_PPTR_OF(type, x)))
+#define ASN1_d2i_bio_of(type, xnew, d2i, in, x)       \
+    ((type *)ASN1_d2i_bio(CHECKED_NEW_OF(type, xnew), \
+        CHECKED_D2I_OF(type, d2i),                    \
+        in,                                           \
+        CHECKED_PPTR_OF(type, x)))
 
 void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *pval,
-                           OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *pval);
 int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, const void *x);
 
-#  define ASN1_i2d_bio_of(type,i2d,out,x) \
+#define ASN1_i2d_bio_of(type, i2d, out, x)   \
     (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(const type, x)))
+        out,                                 \
+        CHECKED_PTR_OF(const type, x)))
 
 int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, const void *x);
 BIO *ASN1_item_i2d_mem_bio(const ASN1_ITEM *it, const ASN1_VALUE *val);
@@ -815,10 +806,10 @@ int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
 int ASN1_STRING_print_ex(BIO *out, const ASN1_STRING *str, unsigned long flags);
 int ASN1_buf_print(BIO *bp, const unsigned char *buf, size_t buflen, int off);
 int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-                  unsigned char *buf, int off);
+    unsigned char *buf, int off);
 int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);
 int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,
-                    int dump);
+    int dump);
 const char *ASN1_tag2str(int tag);
 
 /* Used to load and write Netscape format cert */
@@ -828,29 +819,29 @@ int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
 int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len);
 int ASN1_TYPE_get_octetstring(const ASN1_TYPE *a, unsigned char *data, int max_len);
 int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-                                  unsigned char *data, int len);
+    unsigned char *data, int len);
 int ASN1_TYPE_get_int_octetstring(const ASN1_TYPE *a, long *num,
-                                  unsigned char *data, int max_len);
+    unsigned char *data, int max_len);
 
 void *ASN1_item_unpack(const ASN1_STRING *oct, const ASN1_ITEM *it);
 void *ASN1_item_unpack_ex(const ASN1_STRING *oct, const ASN1_ITEM *it,
-                          OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
-                            ASN1_OCTET_STRING **oct);
+    ASN1_OCTET_STRING **oct);
 
 void ASN1_STRING_set_default_mask(unsigned long mask);
 int ASN1_STRING_set_default_mask_asc(const char *p);
 unsigned long ASN1_STRING_get_default_mask(void);
 int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
-                       int inform, unsigned long mask);
+    int inform, unsigned long mask);
 int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
-                        int inform, unsigned long mask,
-                        long minsize, long maxsize);
+    int inform, unsigned long mask,
+    long minsize, long maxsize);
 
 ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
-                                    const unsigned char *in, int inlen,
-                                    int inform, int nid);
+    const unsigned char *in, int inlen,
+    int inform, int nid);
 ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
 int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
 void ASN1_STRING_TABLE_cleanup(void);
@@ -860,16 +851,16 @@ void ASN1_STRING_TABLE_cleanup(void);
 /* Old API compatible functions */
 ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
 ASN1_VALUE *ASN1_item_new_ex(const ASN1_ITEM *it, OSSL_LIB_CTX *libctx,
-                             const char *propq);
+    const char *propq);
 void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
 ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **val, const unsigned char **in,
-                             long len, const ASN1_ITEM *it,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    long len, const ASN1_ITEM *it,
+    OSSL_LIB_CTX *libctx, const char *propq);
 ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,
-                          long len, const ASN1_ITEM *it);
+    long len, const ASN1_ITEM *it);
 int ASN1_item_i2d(const ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
 int ASN1_item_ndef_i2d(const ASN1_VALUE *val, unsigned char **out,
-                       const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 
 void ASN1_add_oid_module(void);
 void ASN1_add_stable_module(void);
@@ -881,26 +872,26 @@ int ASN1_str2mask(const char *str, unsigned long *pmask);
 /* ASN1 Print flags */
 
 /* Indicate missing OPTIONAL fields */
-# define ASN1_PCTX_FLAGS_SHOW_ABSENT             0x001
+#define ASN1_PCTX_FLAGS_SHOW_ABSENT 0x001
 /* Mark start and end of SEQUENCE */
-# define ASN1_PCTX_FLAGS_SHOW_SEQUENCE           0x002
+#define ASN1_PCTX_FLAGS_SHOW_SEQUENCE 0x002
 /* Mark start and end of SEQUENCE/SET OF */
-# define ASN1_PCTX_FLAGS_SHOW_SSOF               0x004
+#define ASN1_PCTX_FLAGS_SHOW_SSOF 0x004
 /* Show the ASN1 type of primitives */
-# define ASN1_PCTX_FLAGS_SHOW_TYPE               0x008
+#define ASN1_PCTX_FLAGS_SHOW_TYPE 0x008
 /* Don't show ASN1 type of ANY */
-# define ASN1_PCTX_FLAGS_NO_ANY_TYPE             0x010
+#define ASN1_PCTX_FLAGS_NO_ANY_TYPE 0x010
 /* Don't show ASN1 type of MSTRINGs */
-# define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE         0x020
+#define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE 0x020
 /* Don't show field names in SEQUENCE */
-# define ASN1_PCTX_FLAGS_NO_FIELD_NAME           0x040
+#define ASN1_PCTX_FLAGS_NO_FIELD_NAME 0x040
 /* Show structure names of each SEQUENCE field */
-# define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME  0x080
+#define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME 0x080
 /* Don't show structure name even at top level */
-# define ASN1_PCTX_FLAGS_NO_STRUCT_NAME          0x100
+#define ASN1_PCTX_FLAGS_NO_STRUCT_NAME 0x100
 
 int ASN1_item_print(BIO *out, const ASN1_VALUE *ifld, int indent,
-                    const ASN1_ITEM *it, const ASN1_PCTX *pctx);
+    const ASN1_ITEM *it, const ASN1_PCTX *pctx);
 ASN1_PCTX *ASN1_PCTX_new(void);
 void ASN1_PCTX_free(ASN1_PCTX *p);
 unsigned long ASN1_PCTX_get_flags(const ASN1_PCTX *p);
@@ -914,7 +905,7 @@ void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
 unsigned long ASN1_PCTX_get_str_flags(const ASN1_PCTX *p);
 void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
 
-ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb) (ASN1_SCTX *ctx));
+ASN1_SCTX *ASN1_SCTX_new(int (*scan_cb)(ASN1_SCTX *ctx));
 void ASN1_SCTX_free(ASN1_SCTX *p);
 const ASN1_ITEM *ASN1_SCTX_get_item(ASN1_SCTX *p);
 const ASN1_TEMPLATE *ASN1_SCTX_get_template(ASN1_SCTX *p);
@@ -928,21 +919,21 @@ const BIO_METHOD *BIO_f_asn1(void);
 BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);
 
 int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                        const ASN1_ITEM *it);
+    const ASN1_ITEM *it);
 int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                              const char *hdr, const ASN1_ITEM *it);
+    const char *hdr, const ASN1_ITEM *it);
 /* cannot constify val because of CMS_dataFinal() */
 int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
-                     int ctype_nid, int econt_nid,
-                     STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it);
+    int ctype_nid, int econt_nid,
+    STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it);
 int SMIME_write_ASN1_ex(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
-                        int ctype_nid, int econt_nid,
-                        STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it,
-                        OSSL_LIB_CTX *libctx, const char *propq);
+    int ctype_nid, int econt_nid,
+    STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it,
+    OSSL_LIB_CTX *libctx, const char *propq);
 ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
 ASN1_VALUE *SMIME_read_ASN1_ex(BIO *bio, int flags, BIO **bcont,
-                               const ASN1_ITEM *it, ASN1_VALUE **x,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    const ASN1_ITEM *it, ASN1_VALUE **x,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
 int SMIME_text(BIO *in, BIO *out);
 
@@ -950,18 +941,18 @@ const ASN1_ITEM *ASN1_ITEM_lookup(const char *name);
 const ASN1_ITEM *ASN1_ITEM_get(size_t i);
 
 /* Legacy compatibility */
-# define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-         DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-         DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-# define DECLARE_ASN1_FUNCTIONS_const(type) DECLARE_ASN1_FUNCTIONS(type)
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-         DECLARE_ASN1_ENCODE_FUNCTIONS(type, name)
-# define I2D_OF_const(type) I2D_OF(type)
-# define ASN1_dup_of_const(type,i2d,d2i,x) ASN1_dup_of(type,i2d,d2i,x)
-# define ASN1_i2d_fp_of_const(type,i2d,out,x) ASN1_i2d_fp_of(type,i2d,out,x)
-# define ASN1_i2d_bio_of_const(type,i2d,out,x) ASN1_i2d_bio_of(type,i2d,out,x)
+#define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
+    DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name)        \
+    DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
+#define DECLARE_ASN1_FUNCTIONS_const(type) DECLARE_ASN1_FUNCTIONS(type)
+#define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
+    DECLARE_ASN1_ENCODE_FUNCTIONS(type, name)
+#define I2D_OF_const(type) I2D_OF(type)
+#define ASN1_dup_of_const(type, i2d, d2i, x) ASN1_dup_of(type, i2d, d2i, x)
+#define ASN1_i2d_fp_of_const(type, i2d, out, x) ASN1_i2d_fp_of(type, i2d, out, x)
+#define ASN1_i2d_bio_of_const(type, i2d, out, x) ASN1_i2d_bio_of(type, i2d, out, x)
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index 8fd85ed88112..91756141b0f8 100644
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@@ -9,134 +9,132 @@
  */
 
 #ifndef OPENSSL_ASN1ERR_H
-# define OPENSSL_ASN1ERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_ASN1ERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * ASN1 reason codes.
  */
-# define ASN1_R_ADDING_OBJECT                             171
-# define ASN1_R_ASN1_PARSE_ERROR                          203
-# define ASN1_R_ASN1_SIG_PARSE_ERROR                      204
-# define ASN1_R_AUX_ERROR                                 100
-# define ASN1_R_BAD_OBJECT_HEADER                         102
-# define ASN1_R_BAD_TEMPLATE                              230
-# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH                 214
-# define ASN1_R_BN_LIB                                    105
-# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   106
-# define ASN1_R_BUFFER_TOO_SMALL                          107
-# define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER           108
-# define ASN1_R_CONTEXT_NOT_INITIALISED                   217
-# define ASN1_R_DATA_IS_WRONG                             109
-# define ASN1_R_DECODE_ERROR                              110
-# define ASN1_R_DEPTH_EXCEEDED                            174
-# define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED         198
-# define ASN1_R_ENCODE_ERROR                              112
-# define ASN1_R_ERROR_GETTING_TIME                        173
-# define ASN1_R_ERROR_LOADING_SECTION                     172
-# define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               114
-# define ASN1_R_EXPECTING_AN_INTEGER                      115
-# define ASN1_R_EXPECTING_AN_OBJECT                       116
-# define ASN1_R_EXPLICIT_LENGTH_MISMATCH                  119
-# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED              120
-# define ASN1_R_FIELD_MISSING                             121
-# define ASN1_R_FIRST_NUM_TOO_LARGE                       122
-# define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT              232
-# define ASN1_R_HEADER_TOO_LONG                           123
-# define ASN1_R_ILLEGAL_BITSTRING_FORMAT                  175
-# define ASN1_R_ILLEGAL_BOOLEAN                           176
-# define ASN1_R_ILLEGAL_CHARACTERS                        124
-# define ASN1_R_ILLEGAL_FORMAT                            177
-# define ASN1_R_ILLEGAL_HEX                               178
-# define ASN1_R_ILLEGAL_IMPLICIT_TAG                      179
-# define ASN1_R_ILLEGAL_INTEGER                           180
-# define ASN1_R_ILLEGAL_NEGATIVE_VALUE                    226
-# define ASN1_R_ILLEGAL_NESTED_TAGGING                    181
-# define ASN1_R_ILLEGAL_NULL                              125
-# define ASN1_R_ILLEGAL_NULL_VALUE                        182
-# define ASN1_R_ILLEGAL_OBJECT                            183
-# define ASN1_R_ILLEGAL_OPTIONAL_ANY                      126
-# define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE          170
-# define ASN1_R_ILLEGAL_PADDING                           221
-# define ASN1_R_ILLEGAL_TAGGED_ANY                        127
-# define ASN1_R_ILLEGAL_TIME_VALUE                        184
-# define ASN1_R_ILLEGAL_ZERO_CONTENT                      222
-# define ASN1_R_INTEGER_NOT_ASCII_FORMAT                  185
-# define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG                128
-# define ASN1_R_INVALID_BIT_STRING_BITS_LEFT              220
-# define ASN1_R_INVALID_BMPSTRING_LENGTH                  129
-# define ASN1_R_INVALID_DIGIT                             130
-# define ASN1_R_INVALID_MIME_TYPE                         205
-# define ASN1_R_INVALID_MODIFIER                          186
-# define ASN1_R_INVALID_NUMBER                            187
-# define ASN1_R_INVALID_OBJECT_ENCODING                   216
-# define ASN1_R_INVALID_SCRYPT_PARAMETERS                 227
-# define ASN1_R_INVALID_SEPARATOR                         131
-# define ASN1_R_INVALID_STRING_TABLE_VALUE                218
-# define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH            133
-# define ASN1_R_INVALID_UTF8STRING                        134
-# define ASN1_R_INVALID_VALUE                             219
-# define ASN1_R_LENGTH_TOO_LONG                           231
-# define ASN1_R_LIST_ERROR                                188
-# define ASN1_R_MIME_NO_CONTENT_TYPE                      206
-# define ASN1_R_MIME_PARSE_ERROR                          207
-# define ASN1_R_MIME_SIG_PARSE_ERROR                      208
-# define ASN1_R_MISSING_EOC                               137
-# define ASN1_R_MISSING_SECOND_NUMBER                     138
-# define ASN1_R_MISSING_VALUE                             189
-# define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
-# define ASN1_R_MSTRING_WRONG_TAG                         140
-# define ASN1_R_NESTED_ASN1_STRING                        197
-# define ASN1_R_NESTED_TOO_DEEP                           201
-# define ASN1_R_NON_HEX_CHARACTERS                        141
-# define ASN1_R_NOT_ASCII_FORMAT                          190
-# define ASN1_R_NOT_ENOUGH_DATA                           142
-# define ASN1_R_NO_CONTENT_TYPE                           209
-# define ASN1_R_NO_MATCHING_CHOICE_TYPE                   143
-# define ASN1_R_NO_MULTIPART_BODY_FAILURE                 210
-# define ASN1_R_NO_MULTIPART_BOUNDARY                     211
-# define ASN1_R_NO_SIG_CONTENT_TYPE                       212
-# define ASN1_R_NULL_IS_WRONG_LENGTH                      144
-# define ASN1_R_OBJECT_NOT_ASCII_FORMAT                   191
-# define ASN1_R_ODD_NUMBER_OF_CHARS                       145
-# define ASN1_R_SECOND_NUMBER_TOO_LARGE                   147
-# define ASN1_R_SEQUENCE_LENGTH_MISMATCH                  148
-# define ASN1_R_SEQUENCE_NOT_CONSTRUCTED                  149
-# define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG              192
-# define ASN1_R_SHORT_LINE                                150
-# define ASN1_R_SIG_INVALID_MIME_TYPE                     213
-# define ASN1_R_STREAMING_NOT_SUPPORTED                   202
-# define ASN1_R_STRING_TOO_LONG                           151
-# define ASN1_R_STRING_TOO_SHORT                          152
-# define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
-# define ASN1_R_TIME_NOT_ASCII_FORMAT                     193
-# define ASN1_R_TOO_LARGE                                 223
-# define ASN1_R_TOO_LONG                                  155
-# define ASN1_R_TOO_SMALL                                 224
-# define ASN1_R_TYPE_NOT_CONSTRUCTED                      156
-# define ASN1_R_TYPE_NOT_PRIMITIVE                        195
-# define ASN1_R_UNEXPECTED_EOC                            159
-# define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH           215
-# define ASN1_R_UNKNOWN_DIGEST                            229
-# define ASN1_R_UNKNOWN_FORMAT                            160
-# define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          161
-# define ASN1_R_UNKNOWN_OBJECT_TYPE                       162
-# define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   163
-# define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM               199
-# define ASN1_R_UNKNOWN_TAG                               194
-# define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE           164
-# define ASN1_R_UNSUPPORTED_CIPHER                        228
-# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               167
-# define ASN1_R_UNSUPPORTED_TYPE                          196
-# define ASN1_R_UTCTIME_IS_TOO_SHORT                      233
-# define ASN1_R_WRONG_INTEGER_TYPE                        225
-# define ASN1_R_WRONG_PUBLIC_KEY_TYPE                     200
-# define ASN1_R_WRONG_TAG                                 168
+#define ASN1_R_ADDING_OBJECT 171
+#define ASN1_R_ASN1_PARSE_ERROR 203
+#define ASN1_R_ASN1_SIG_PARSE_ERROR 204
+#define ASN1_R_AUX_ERROR 100
+#define ASN1_R_BAD_OBJECT_HEADER 102
+#define ASN1_R_BAD_TEMPLATE 230
+#define ASN1_R_BMPSTRING_IS_WRONG_LENGTH 214
+#define ASN1_R_BN_LIB 105
+#define ASN1_R_BOOLEAN_IS_WRONG_LENGTH 106
+#define ASN1_R_BUFFER_TOO_SMALL 107
+#define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER 108
+#define ASN1_R_CONTEXT_NOT_INITIALISED 217
+#define ASN1_R_DATA_IS_WRONG 109
+#define ASN1_R_DECODE_ERROR 110
+#define ASN1_R_DEPTH_EXCEEDED 174
+#define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED 198
+#define ASN1_R_ENCODE_ERROR 112
+#define ASN1_R_ERROR_GETTING_TIME 173
+#define ASN1_R_ERROR_LOADING_SECTION 172
+#define ASN1_R_ERROR_SETTING_CIPHER_PARAMS 114
+#define ASN1_R_EXPECTING_AN_INTEGER 115
+#define ASN1_R_EXPECTING_AN_OBJECT 116
+#define ASN1_R_EXPLICIT_LENGTH_MISMATCH 119
+#define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED 120
+#define ASN1_R_FIELD_MISSING 121
+#define ASN1_R_FIRST_NUM_TOO_LARGE 122
+#define ASN1_R_GENERALIZEDTIME_IS_TOO_SHORT 232
+#define ASN1_R_HEADER_TOO_LONG 123
+#define ASN1_R_ILLEGAL_BITSTRING_FORMAT 175
+#define ASN1_R_ILLEGAL_BOOLEAN 176
+#define ASN1_R_ILLEGAL_CHARACTERS 124
+#define ASN1_R_ILLEGAL_FORMAT 177
+#define ASN1_R_ILLEGAL_HEX 178
+#define ASN1_R_ILLEGAL_IMPLICIT_TAG 179
+#define ASN1_R_ILLEGAL_INTEGER 180
+#define ASN1_R_ILLEGAL_NEGATIVE_VALUE 226
+#define ASN1_R_ILLEGAL_NESTED_TAGGING 181
+#define ASN1_R_ILLEGAL_NULL 125
+#define ASN1_R_ILLEGAL_NULL_VALUE 182
+#define ASN1_R_ILLEGAL_OBJECT 183
+#define ASN1_R_ILLEGAL_OPTIONAL_ANY 126
+#define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE 170
+#define ASN1_R_ILLEGAL_PADDING 221
+#define ASN1_R_ILLEGAL_TAGGED_ANY 127
+#define ASN1_R_ILLEGAL_TIME_VALUE 184
+#define ASN1_R_ILLEGAL_ZERO_CONTENT 222
+#define ASN1_R_INTEGER_NOT_ASCII_FORMAT 185
+#define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG 128
+#define ASN1_R_INVALID_BIT_STRING_BITS_LEFT 220
+#define ASN1_R_INVALID_BMPSTRING_LENGTH 129
+#define ASN1_R_INVALID_DIGIT 130
+#define ASN1_R_INVALID_MIME_TYPE 205
+#define ASN1_R_INVALID_MODIFIER 186
+#define ASN1_R_INVALID_NUMBER 187
+#define ASN1_R_INVALID_OBJECT_ENCODING 216
+#define ASN1_R_INVALID_SCRYPT_PARAMETERS 227
+#define ASN1_R_INVALID_SEPARATOR 131
+#define ASN1_R_INVALID_STRING_TABLE_VALUE 218
+#define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH 133
+#define ASN1_R_INVALID_UTF8STRING 134
+#define ASN1_R_INVALID_VALUE 219
+#define ASN1_R_LENGTH_TOO_LONG 231
+#define ASN1_R_LIST_ERROR 188
+#define ASN1_R_MIME_NO_CONTENT_TYPE 206
+#define ASN1_R_MIME_PARSE_ERROR 207
+#define ASN1_R_MIME_SIG_PARSE_ERROR 208
+#define ASN1_R_MISSING_EOC 137
+#define ASN1_R_MISSING_SECOND_NUMBER 138
+#define ASN1_R_MISSING_VALUE 189
+#define ASN1_R_MSTRING_NOT_UNIVERSAL 139
+#define ASN1_R_MSTRING_WRONG_TAG 140
+#define ASN1_R_NESTED_ASN1_STRING 197
+#define ASN1_R_NESTED_TOO_DEEP 201
+#define ASN1_R_NON_HEX_CHARACTERS 141
+#define ASN1_R_NOT_ASCII_FORMAT 190
+#define ASN1_R_NOT_ENOUGH_DATA 142
+#define ASN1_R_NO_CONTENT_TYPE 209
+#define ASN1_R_NO_MATCHING_CHOICE_TYPE 143
+#define ASN1_R_NO_MULTIPART_BODY_FAILURE 210
+#define ASN1_R_NO_MULTIPART_BOUNDARY 211
+#define ASN1_R_NO_SIG_CONTENT_TYPE 212
+#define ASN1_R_NULL_IS_WRONG_LENGTH 144
+#define ASN1_R_OBJECT_NOT_ASCII_FORMAT 191
+#define ASN1_R_ODD_NUMBER_OF_CHARS 145
+#define ASN1_R_SECOND_NUMBER_TOO_LARGE 147
+#define ASN1_R_SEQUENCE_LENGTH_MISMATCH 148
+#define ASN1_R_SEQUENCE_NOT_CONSTRUCTED 149
+#define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG 192
+#define ASN1_R_SHORT_LINE 150
+#define ASN1_R_SIG_INVALID_MIME_TYPE 213
+#define ASN1_R_STREAMING_NOT_SUPPORTED 202
+#define ASN1_R_STRING_TOO_LONG 151
+#define ASN1_R_STRING_TOO_SHORT 152
+#define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
+#define ASN1_R_TIME_NOT_ASCII_FORMAT 193
+#define ASN1_R_TOO_LARGE 223
+#define ASN1_R_TOO_LONG 155
+#define ASN1_R_TOO_SMALL 224
+#define ASN1_R_TYPE_NOT_CONSTRUCTED 156
+#define ASN1_R_TYPE_NOT_PRIMITIVE 195
+#define ASN1_R_UNEXPECTED_EOC 159
+#define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH 215
+#define ASN1_R_UNKNOWN_DIGEST 229
+#define ASN1_R_UNKNOWN_FORMAT 160
+#define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM 161
+#define ASN1_R_UNKNOWN_OBJECT_TYPE 162
+#define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE 163
+#define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM 199
+#define ASN1_R_UNKNOWN_TAG 194
+#define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE 164
+#define ASN1_R_UNSUPPORTED_CIPHER 228
+#define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE 167
+#define ASN1_R_UNSUPPORTED_TYPE 196
+#define ASN1_R_UTCTIME_IS_TOO_SHORT 233
+#define ASN1_R_WRONG_INTEGER_TYPE 225
+#define ASN1_R_WRONG_PUBLIC_KEY_TYPE 200
+#define ASN1_R_WRONG_TAG 168
 
 #endif
diff --git a/include/openssl/asn1t.h.in b/include/openssl/asn1t.h.in
index b536fe51a20a..ca8bbc2517da 100644
--- a/include/openssl/asn1t.h.in
+++ b/include/openssl/asn1t.h.in
@@ -9,31 +9,33 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_ASN1T_H
-# define OPENSSL_ASN1T_H
-# pragma once
+#define OPENSSL_ASN1T_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ASN1T_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ASN1T_H
+#endif
 
-# include <stddef.h>
-# include <openssl/e_os2.h>
-# include <openssl/asn1.h>
+#include <stddef.h>
+#include <openssl/e_os2.h>
+#include <openssl/asn1.h>
 
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+#undef OPENSSL_EXTERN
+#define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
 
 /* ASN1 template defines, structures and functions */
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -78,59 +80,58 @@ extern "C" {
  *
  */
 
-# define ASN1_ITYPE_PRIMITIVE            0x0
-# define ASN1_ITYPE_SEQUENCE             0x1
-# define ASN1_ITYPE_CHOICE               0x2
+#define ASN1_ITYPE_PRIMITIVE 0x0
+#define ASN1_ITYPE_SEQUENCE 0x1
+#define ASN1_ITYPE_CHOICE 0x2
 /* unused value                          0x3 */
-# define ASN1_ITYPE_EXTERN               0x4
-# define ASN1_ITYPE_MSTRING              0x5
-# define ASN1_ITYPE_NDEF_SEQUENCE        0x6
+#define ASN1_ITYPE_EXTERN 0x4
+#define ASN1_ITYPE_MSTRING 0x5
+#define ASN1_ITYPE_NDEF_SEQUENCE 0x6
 
 /* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-# define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)((iptr)()))
+#define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)((iptr)()))
 
 /* Macros for start and end of ASN1_ITEM definition */
 
-# define ASN1_ITEM_start(itname) \
-        const ASN1_ITEM * itname##_it(void) \
-        { \
-                static const ASN1_ITEM local_it = {
+#define ASN1_ITEM_start(itname)        \
+    const ASN1_ITEM *itname##_it(void) \
+    {                                  \
+        static const ASN1_ITEM local_it = {
 
-# define static_ASN1_ITEM_start(itname) \
-        static ASN1_ITEM_start(itname)
+#define static_ASN1_ITEM_start(itname) \
+    static ASN1_ITEM_start(itname)
 
-# define ASN1_ITEM_end(itname) \
-                }; \
-        return &local_it; \
-        }
+#define ASN1_ITEM_end(itname) \
+    }                         \
+    ;                         \
+    return &local_it;         \
+    }
 
 /* Macros to aid ASN1 template writing */
 
-# define ASN1_ITEM_TEMPLATE(tname) \
-        static const ASN1_TEMPLATE tname##_item_tt
+#define ASN1_ITEM_TEMPLATE(tname) \
+    static const ASN1_TEMPLATE tname##_item_tt
 
-# define ASN1_ITEM_TEMPLATE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_PRIMITIVE,\
-                -1,\
-                &tname##_item_tt,\
-                0,\
-                NULL,\
-                0,\
-                #tname \
-        ASN1_ITEM_end(tname)
-# define static_ASN1_ITEM_TEMPLATE_END(tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_PRIMITIVE,\
-                -1,\
-                &tname##_item_tt,\
-                0,\
-                NULL,\
-                0,\
-                #tname \
-        ASN1_ITEM_end(tname)
+#define ASN1_ITEM_TEMPLATE_END(tname) \
+    ;                                 \
+    ASN1_ITEM_start(tname)            \
+        ASN1_ITYPE_PRIMITIVE,         \
+        -1,                           \
+        &tname##_item_tt,             \
+        0,                            \
+        NULL,                         \
+        0,                            \
+        #tname ASN1_ITEM_end(tname)
+#define static_ASN1_ITEM_TEMPLATE_END(tname) \
+    ;                                        \
+    static_ASN1_ITEM_start(tname)            \
+        ASN1_ITYPE_PRIMITIVE,                \
+        -1,                                  \
+        &tname##_item_tt,                    \
+        0,                                   \
+        NULL,                                \
+        0,                                   \
+        #tname ASN1_ITEM_end(tname)
 
 /* This is a ASN1 type which just embeds a template */
 
@@ -155,128 +156,118 @@ extern "C" {
  *      a structure called stname.
  */
 
-# define ASN1_SEQUENCE(tname) \
-        static const ASN1_TEMPLATE tname##_seq_tt[]
+#define ASN1_SEQUENCE(tname) \
+    static const ASN1_TEMPLATE tname##_seq_tt[]
 
-# define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
+#define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
 
-# define static_ASN1_SEQUENCE_END(stname) static_ASN1_SEQUENCE_END_name(stname, stname)
+#define static_ASN1_SEQUENCE_END(stname) static_ASN1_SEQUENCE_END_name(stname, stname)
 
-# define ASN1_SEQUENCE_END_name(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #tname \
-        ASN1_ITEM_end(tname)
+#define ASN1_SEQUENCE_END_name(stname, tname)           \
+    ;                                                   \
+    ASN1_ITEM_start(tname)                              \
+        ASN1_ITYPE_SEQUENCE,                            \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        NULL,                                           \
+        sizeof(stname),                                 \
+        #tname ASN1_ITEM_end(tname)
 
-# define static_ASN1_SEQUENCE_END_name(stname, tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
+#define static_ASN1_SEQUENCE_END_name(stname, tname)    \
+    ;                                                   \
+    static_ASN1_ITEM_start(tname)                       \
+        ASN1_ITYPE_SEQUENCE,                            \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        NULL,                                           \
+        sizeof(stname),                                 \
+        #stname ASN1_ITEM_end(tname)
 
-# define ASN1_NDEF_SEQUENCE(tname) \
-        ASN1_SEQUENCE(tname)
+#define ASN1_NDEF_SEQUENCE(tname) \
+    ASN1_SEQUENCE(tname)
 
-# define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
-        ASN1_SEQUENCE_cb(tname, cb)
+#define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
+    ASN1_SEQUENCE_cb(tname, cb)
 
-# define ASN1_SEQUENCE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0, NULL}; \
-        ASN1_SEQUENCE(tname)
+#define ASN1_SEQUENCE_cb(tname, cb)                                     \
+    static const ASN1_AUX tname##_aux = { NULL, 0, 0, 0, cb, 0, NULL }; \
+    ASN1_SEQUENCE(tname)
 
-# define ASN1_SEQUENCE_const_cb(tname, const_cb) \
-        static const ASN1_AUX tname##_aux = \
-            {NULL, ASN1_AFLG_CONST_CB, 0, 0, NULL, 0, const_cb}; \
-        ASN1_SEQUENCE(tname)
+#define ASN1_SEQUENCE_const_cb(tname, const_cb)                                                \
+    static const ASN1_AUX tname##_aux = { NULL, ASN1_AFLG_CONST_CB, 0, 0, NULL, 0, const_cb }; \
+    ASN1_SEQUENCE(tname)
 
-# define ASN1_SEQUENCE_cb_const_cb(tname, cb, const_cb) \
-        static const ASN1_AUX tname##_aux = \
-            {NULL, ASN1_AFLG_CONST_CB, 0, 0, cb, 0, const_cb}; \
-        ASN1_SEQUENCE(tname)
+#define ASN1_SEQUENCE_cb_const_cb(tname, cb, const_cb)                                       \
+    static const ASN1_AUX tname##_aux = { NULL, ASN1_AFLG_CONST_CB, 0, 0, cb, 0, const_cb }; \
+    ASN1_SEQUENCE(tname)
 
-# define ASN1_SEQUENCE_ref(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), offsetof(tname, lock), cb, 0, NULL}; \
-        ASN1_SEQUENCE(tname)
+#define ASN1_SEQUENCE_ref(tname, cb)                                                                                                   \
+    static const ASN1_AUX tname##_aux = { NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), offsetof(tname, lock), cb, 0, NULL }; \
+    ASN1_SEQUENCE(tname)
 
-# define ASN1_SEQUENCE_enc(tname, enc, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc), NULL}; \
-        ASN1_SEQUENCE(tname)
+#define ASN1_SEQUENCE_enc(tname, enc, cb)                                                                   \
+    static const ASN1_AUX tname##_aux = { NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc), NULL }; \
+    ASN1_SEQUENCE(tname)
 
-# define ASN1_NDEF_SEQUENCE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(tname),\
-                #tname \
-        ASN1_ITEM_end(tname)
-# define static_ASN1_NDEF_SEQUENCE_END(tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(tname),\
-                #tname \
-        ASN1_ITEM_end(tname)
+#define ASN1_NDEF_SEQUENCE_END(tname)                   \
+    ;                                                   \
+    ASN1_ITEM_start(tname)                              \
+        ASN1_ITYPE_NDEF_SEQUENCE,                       \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        NULL,                                           \
+        sizeof(tname),                                  \
+        #tname ASN1_ITEM_end(tname)
+#define static_ASN1_NDEF_SEQUENCE_END(tname)            \
+    ;                                                   \
+    static_ASN1_ITEM_start(tname)                       \
+        ASN1_ITYPE_NDEF_SEQUENCE,                       \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        NULL,                                           \
+        sizeof(tname),                                  \
+        #tname ASN1_ITEM_end(tname)
 
+#define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
 
-# define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
+#define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
+#define static_ASN1_SEQUENCE_END_cb(stname, tname) static_ASN1_SEQUENCE_END_ref(stname, tname)
 
-# define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-# define static_ASN1_SEQUENCE_END_cb(stname, tname) static_ASN1_SEQUENCE_END_ref(stname, tname)
+#define ASN1_SEQUENCE_END_ref(stname, tname)            \
+    ;                                                   \
+    ASN1_ITEM_start(tname)                              \
+        ASN1_ITYPE_SEQUENCE,                            \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        &tname##_aux,                                   \
+        sizeof(stname),                                 \
+        #tname ASN1_ITEM_end(tname)
+#define static_ASN1_SEQUENCE_END_ref(stname, tname)     \
+    ;                                                   \
+    static_ASN1_ITEM_start(tname)                       \
+        ASN1_ITYPE_SEQUENCE,                            \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        &tname##_aux,                                   \
+        sizeof(stname),                                 \
+        #stname ASN1_ITEM_end(tname)
 
-# define ASN1_SEQUENCE_END_ref(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #tname \
-        ASN1_ITEM_end(tname)
-# define static_ASN1_SEQUENCE_END_ref(stname, tname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE_END_cb(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
+#define ASN1_NDEF_SEQUENCE_END_cb(stname, tname)        \
+    ;                                                   \
+    ASN1_ITEM_start(tname)                              \
+        ASN1_ITYPE_NDEF_SEQUENCE,                       \
+        V_ASN1_SEQUENCE,                                \
+        tname##_seq_tt,                                 \
+        sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE), \
+        &tname##_aux,                                   \
+        sizeof(stname),                                 \
+        #stname ASN1_ITEM_end(tname)
 
 /*-
  * This pair helps declare a CHOICE type. We can do:
@@ -301,185 +292,183 @@ extern "C" {
  *      ASN1_CHOICE_END_selector() version.
  */
 
-# define ASN1_CHOICE(tname) \
-        static const ASN1_TEMPLATE tname##_ch_tt[]
+#define ASN1_CHOICE(tname) \
+    static const ASN1_TEMPLATE tname##_ch_tt[]
 
-# define ASN1_CHOICE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0, NULL}; \
-        ASN1_CHOICE(tname)
+#define ASN1_CHOICE_cb(tname, cb)                                       \
+    static const ASN1_AUX tname##_aux = { NULL, 0, 0, 0, cb, 0, NULL }; \
+    ASN1_CHOICE(tname)
 
-# define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
+#define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
 
-# define static_ASN1_CHOICE_END(stname) static_ASN1_CHOICE_END_name(stname, stname)
+#define static_ASN1_CHOICE_END(stname) static_ASN1_CHOICE_END_name(stname, stname)
 
-# define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
+#define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
 
-# define static_ASN1_CHOICE_END_name(stname, tname) static_ASN1_CHOICE_END_selector(stname, tname, type)
+#define static_ASN1_CHOICE_END_name(stname, tname) static_ASN1_CHOICE_END_selector(stname, tname, type)
 
-# define ASN1_CHOICE_END_selector(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
+#define ASN1_CHOICE_END_selector(stname, tname, selname) \
+    ;                                                    \
+    ASN1_ITEM_start(tname)                               \
+        ASN1_ITYPE_CHOICE,                               \
+        offsetof(stname, selname),                       \
+        tname##_ch_tt,                                   \
+        sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),   \
+        NULL,                                            \
+        sizeof(stname),                                  \
+        #stname ASN1_ITEM_end(tname)
 
-# define static_ASN1_CHOICE_END_selector(stname, tname, selname) \
-        ;\
-        static_ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
+#define static_ASN1_CHOICE_END_selector(stname, tname, selname) \
+    ;                                                           \
+    static_ASN1_ITEM_start(tname)                               \
+        ASN1_ITYPE_CHOICE,                                      \
+        offsetof(stname, selname),                              \
+        tname##_ch_tt,                                          \
+        sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),          \
+        NULL,                                                   \
+        sizeof(stname),                                         \
+        #stname ASN1_ITEM_end(tname)
 
-# define ASN1_CHOICE_END_cb(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
+#define ASN1_CHOICE_END_cb(stname, tname, selname)     \
+    ;                                                  \
+    ASN1_ITEM_start(tname)                             \
+        ASN1_ITYPE_CHOICE,                             \
+        offsetof(stname, selname),                     \
+        tname##_ch_tt,                                 \
+        sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE), \
+        &tname##_aux,                                  \
+        sizeof(stname),                                \
+        #stname ASN1_ITEM_end(tname)
 
 /* This helps with the template wrapper form of ASN1_ITEM */
 
-# define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
-        (flags), (tag), 0,\
-        #name, ASN1_ITEM_ref(type) }
+#define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
+    (flags), (tag), 0,                                  \
+    #name, ASN1_ITEM_ref(type)                          \
+}
 
 /* These help with SEQUENCE or CHOICE components */
 
 /* used to declare other types */
 
-# define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
-        (flags), (tag), offsetof(stname, field),\
-        #field, ASN1_ITEM_ref(type) }
+#define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
+    (flags), (tag), offsetof(stname, field),            \
+    #field, ASN1_ITEM_ref(type)                         \
+}
 
 /* implicit and explicit helper macros */
 
-# define ASN1_IMP_EX(stname, field, type, tag, ex) \
-         ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | (ex), tag, stname, field, type)
+#define ASN1_IMP_EX(stname, field, type, tag, ex) \
+    ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | (ex), tag, stname, field, type)
 
-# define ASN1_EXP_EX(stname, field, type, tag, ex) \
-         ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | (ex), tag, stname, field, type)
+#define ASN1_EXP_EX(stname, field, type, tag, ex) \
+    ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | (ex), tag, stname, field, type)
 
 /* Any defined by macros: the field used is in the table itself */
 
-# define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
-# define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
+#define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
+#define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
 
 /* Plain simple type */
-# define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
+#define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0, 0, stname, field, type)
 /* Embedded simple type */
-# define ASN1_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_EMBED,0, stname, field, type)
+#define ASN1_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_EMBED, 0, stname, field, type)
 
 /* OPTIONAL simple type */
-# define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-# define ASN1_OPT_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED, 0, stname, field, type)
+#define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
+#define ASN1_OPT_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL | ASN1_TFLG_EMBED, 0, stname, field, type)
 
 /* IMPLICIT tagged simple type */
-# define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
-# define ASN1_IMP_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
+#define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
+#define ASN1_IMP_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
 
 /* IMPLICIT tagged OPTIONAL simple type */
-# define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-# define ASN1_IMP_OPT_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED)
+#define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
+#define ASN1_IMP_OPT_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL | ASN1_TFLG_EMBED)
 
 /* Same as above but EXPLICIT */
 
-# define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
-# define ASN1_EXP_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
-# define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-# define ASN1_EXP_OPT_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED)
+#define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
+#define ASN1_EXP_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
+#define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
+#define ASN1_EXP_OPT_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL | ASN1_TFLG_EMBED)
 
 /* SEQUENCE OF type */
-# define ASN1_SEQUENCE_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
+#define ASN1_SEQUENCE_OF(stname, field, type) \
+    ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
 
 /* OPTIONAL SEQUENCE OF */
-# define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
+#define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
+    ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL, 0, stname, field, type)
 
 /* Same as above but for SET OF */
 
-# define ASN1_SET_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
+#define ASN1_SET_OF(stname, field, type) \
+    ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
 
-# define ASN1_SET_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
+#define ASN1_SET_OF_OPT(stname, field, type) \
+    ASN1_EX_TYPE(ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL, 0, stname, field, type)
 
 /* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */
 
-# define ASN1_IMP_SET_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
+#define ASN1_IMP_SET_OF(stname, field, type, tag) \
+    ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
 
-# define ASN1_EXP_SET_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
+#define ASN1_EXP_SET_OF(stname, field, type, tag) \
+    ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
 
-# define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
+#define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
+    ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL)
 
-# define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
+#define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
+    ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF | ASN1_TFLG_OPTIONAL)
 
-# define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
+#define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
+    ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
 
-# define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
+#define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
+    ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL)
 
-# define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
+#define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
+    ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
 
-# define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
+#define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
+    ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF | ASN1_TFLG_OPTIONAL)
 
 /* EXPLICIT using indefinite length constructed form */
-# define ASN1_NDEF_EXP(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
+#define ASN1_NDEF_EXP(stname, field, type, tag) \
+    ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
 
 /* EXPLICIT OPTIONAL using indefinite length constructed form */
-# define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
+#define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
+    ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL | ASN1_TFLG_NDEF)
 
 /* Macros for the ASN1_ADB structure */
 
-# define ASN1_ADB(name) \
-        static const ASN1_ADB_TABLE name##_adbtbl[]
+#define ASN1_ADB(name) \
+    static const ASN1_ADB_TABLE name##_adbtbl[]
 
-# define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
-        ;\
-        static const ASN1_ITEM *name##_adb(void) \
-        { \
-        static const ASN1_ADB internal_adb = \
-                {\
-                flags,\
-                offsetof(name, field),\
-                adb_cb,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-                }; \
-                return (const ASN1_ITEM *) &internal_adb; \
-        } \
-        void dummy_function(void)
+#define ASN1_ADB_END(name, flags, field, adb_cb, def, none) \
+    ;                                                       \
+    static const ASN1_ITEM *name##_adb(void)                \
+    {                                                       \
+        static const ASN1_ADB internal_adb = {              \
+            flags,                                          \
+            offsetof(name, field),                          \
+            adb_cb,                                         \
+            name##_adbtbl,                                  \
+            sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE), \
+            def,                                            \
+            none                                            \
+        };                                                  \
+        return (const ASN1_ITEM *)&internal_adb;            \
+    }                                                       \
+    void dummy_function(void)
 
-# define ADB_ENTRY(val, template) {val, template}
+#define ADB_ENTRY(val, template) { val, template }
 
-# define ASN1_ADB_TEMPLATE(name) \
-        static const ASN1_TEMPLATE name##_tt
+#define ASN1_ADB_TEMPLATE(name) \
+    static const ASN1_TEMPLATE name##_tt
 
 /*
  * This is the ASN1 template structure that defines a wrapper round the
@@ -488,56 +477,56 @@ extern "C" {
  */
 
 struct ASN1_TEMPLATE_st {
-    unsigned long flags;        /* Various flags */
-    long tag;                   /* tag, not used if no tagging */
-    unsigned long offset;       /* Offset of this field in structure */
-    const char *field_name;     /* Field name */
-    ASN1_ITEM_EXP *item;        /* Relevant ASN1_ITEM or ASN1_ADB */
+    unsigned long flags; /* Various flags */
+    long tag; /* tag, not used if no tagging */
+    unsigned long offset; /* Offset of this field in structure */
+    const char *field_name; /* Field name */
+    ASN1_ITEM_EXP *item; /* Relevant ASN1_ITEM or ASN1_ADB */
 };
 
 /* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
 
-# define ASN1_TEMPLATE_item(t) (t->item_ptr)
-# define ASN1_TEMPLATE_adb(t) (t->item_ptr)
+#define ASN1_TEMPLATE_item(t) (t->item_ptr)
+#define ASN1_TEMPLATE_adb(t) (t->item_ptr)
 
 typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
 typedef struct ASN1_ADB_st ASN1_ADB;
 
 struct ASN1_ADB_st {
-    unsigned long flags;        /* Various flags */
-    unsigned long offset;       /* Offset of selector field */
-    int (*adb_cb)(long *psel);  /* Application callback */
-    const ASN1_ADB_TABLE *tbl;  /* Table of possible types */
-    long tblcount;              /* Number of entries in tbl */
+    unsigned long flags; /* Various flags */
+    unsigned long offset; /* Offset of selector field */
+    int (*adb_cb)(long *psel); /* Application callback */
+    const ASN1_ADB_TABLE *tbl; /* Table of possible types */
+    long tblcount; /* Number of entries in tbl */
     const ASN1_TEMPLATE *default_tt; /* Type to use if no match */
     const ASN1_TEMPLATE *null_tt; /* Type to use if selector is NULL */
 };
 
 struct ASN1_ADB_TABLE_st {
-    long value;                 /* NID for an object or value for an int */
-    const ASN1_TEMPLATE tt;     /* item for this value */
+    long value; /* NID for an object or value for an int */
+    const ASN1_TEMPLATE tt; /* item for this value */
 };
 
 /* template flags */
 
 /* Field is optional */
-# define ASN1_TFLG_OPTIONAL      (0x1)
+#define ASN1_TFLG_OPTIONAL (0x1)
 
 /* Field is a SET OF */
-# define ASN1_TFLG_SET_OF        (0x1 << 1)
+#define ASN1_TFLG_SET_OF (0x1 << 1)
 
 /* Field is a SEQUENCE OF */
-# define ASN1_TFLG_SEQUENCE_OF   (0x2 << 1)
+#define ASN1_TFLG_SEQUENCE_OF (0x2 << 1)
 
 /*
  * Special case: this refers to a SET OF that will be sorted into DER order
  * when encoded *and* the corresponding STACK will be modified to match the
  * new order.
  */
-# define ASN1_TFLG_SET_ORDER     (0x3 << 1)
+#define ASN1_TFLG_SET_ORDER (0x3 << 1)
 
 /* Mask for SET OF or SEQUENCE OF */
-# define ASN1_TFLG_SK_MASK       (0x3 << 1)
+#define ASN1_TFLG_SK_MASK (0x3 << 1)
 
 /*
  * These flags mean the tag should be taken from the tag field. If EXPLICIT
@@ -545,18 +534,18 @@ struct ASN1_ADB_TABLE_st {
  */
 
 /* IMPLICIT tagging */
-# define ASN1_TFLG_IMPTAG        (0x1 << 3)
+#define ASN1_TFLG_IMPTAG (0x1 << 3)
 
 /* EXPLICIT tagging, inner tag from underlying type */
-# define ASN1_TFLG_EXPTAG        (0x2 << 3)
+#define ASN1_TFLG_EXPTAG (0x2 << 3)
 
-# define ASN1_TFLG_TAG_MASK      (0x3 << 3)
+#define ASN1_TFLG_TAG_MASK (0x3 << 3)
 
 /* context specific IMPLICIT */
-# define ASN1_TFLG_IMPLICIT      (ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT)
+#define ASN1_TFLG_IMPLICIT (ASN1_TFLG_IMPTAG | ASN1_TFLG_CONTEXT)
 
 /* context specific EXPLICIT */
-# define ASN1_TFLG_EXPLICIT      (ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT)
+#define ASN1_TFLG_EXPLICIT (ASN1_TFLG_EXPTAG | ASN1_TFLG_CONTEXT)
 
 /*
  * If tagging is in force these determine the type of tag to use. Otherwise
@@ -565,15 +554,15 @@ struct ASN1_ADB_TABLE_st {
  */
 
 /* Universal tag */
-# define ASN1_TFLG_UNIVERSAL     (0x0<<6)
+#define ASN1_TFLG_UNIVERSAL (0x0 << 6)
 /* Application tag */
-# define ASN1_TFLG_APPLICATION   (0x1<<6)
+#define ASN1_TFLG_APPLICATION (0x1 << 6)
 /* Context specific tag */
-# define ASN1_TFLG_CONTEXT       (0x2<<6)
+#define ASN1_TFLG_CONTEXT (0x2 << 6)
 /* Private tag */
-# define ASN1_TFLG_PRIVATE       (0x3<<6)
+#define ASN1_TFLG_PRIVATE (0x3 << 6)
 
-# define ASN1_TFLG_TAG_CLASS     (0x3<<6)
+#define ASN1_TFLG_TAG_CLASS (0x3 << 6)
 
 /*
  * These are for ANY DEFINED BY type. In this case the 'item' field points to
@@ -581,35 +570,35 @@ struct ASN1_ADB_TABLE_st {
  * relevant type
  */
 
-# define ASN1_TFLG_ADB_MASK      (0x3<<8)
+#define ASN1_TFLG_ADB_MASK (0x3 << 8)
 
-# define ASN1_TFLG_ADB_OID       (0x1<<8)
+#define ASN1_TFLG_ADB_OID (0x1 << 8)
 
-# define ASN1_TFLG_ADB_INT       (0x1<<9)
+#define ASN1_TFLG_ADB_INT (0x1 << 9)
 
 /*
  * This flag when present in a SEQUENCE OF, SET OF or EXPLICIT causes
  * indefinite length constructed encoding to be used if required.
  */
 
-# define ASN1_TFLG_NDEF          (0x1<<11)
+#define ASN1_TFLG_NDEF (0x1 << 11)
 
 /* Field is embedded and not a pointer */
-# define ASN1_TFLG_EMBED         (0x1 << 12)
+#define ASN1_TFLG_EMBED (0x1 << 12)
 
 /* This is the actual ASN1 item itself */
 
 struct ASN1_ITEM_st {
-    char itype;                 /* The item type, primitive, SEQUENCE, CHOICE
-                                 * or extern */
-    long utype;                 /* underlying type */
+    char itype; /* The item type, primitive, SEQUENCE, CHOICE
+                 * or extern */
+    long utype; /* underlying type */
     const ASN1_TEMPLATE *templates; /* If SEQUENCE or CHOICE this contains
                                      * the contents */
-    long tcount;                /* Number of templates if SEQUENCE or CHOICE */
-    const void *funcs;          /* further data and type-specific functions */
+    long tcount; /* Number of templates if SEQUENCE or CHOICE */
+    const void *funcs; /* further data and type-specific functions */
     /* funcs can be ASN1_PRIMITIVE_FUNCS*, ASN1_EXTERN_FUNCS*, or ASN1_AUX* */
-    long size;                  /* Structure size (usually) */
-    const char *sname;          /* Structure name */
+    long size; /* Structure size (usually) */
+    const char *sname; /* Structure name */
 };
 
 /*
@@ -618,42 +607,42 @@ struct ASN1_ITEM_st {
  */
 
 struct ASN1_TLC_st {
-    char valid;                 /* Values below are valid */
-    int ret;                    /* return value */
-    long plen;                  /* length */
-    int ptag;                   /* class value */
-    int pclass;                 /* class value */
-    int hdrlen;                 /* header length */
+    char valid; /* Values below are valid */
+    int ret; /* return value */
+    long plen; /* length */
+    int ptag; /* class value */
+    int pclass; /* class value */
+    int hdrlen; /* header length */
 };
 
 /* Typedefs for ASN1 function pointers */
 typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                        const ASN1_ITEM *it, int tag, int aclass, char opt,
-                        ASN1_TLC *ctx);
+    const ASN1_ITEM *it, int tag, int aclass, char opt,
+    ASN1_TLC *ctx);
 
 typedef int ASN1_ex_d2i_ex(ASN1_VALUE **pval, const unsigned char **in, long len,
-                           const ASN1_ITEM *it, int tag, int aclass, char opt,
-                           ASN1_TLC *ctx, OSSL_LIB_CTX *libctx,
-                           const char *propq);
+    const ASN1_ITEM *it, int tag, int aclass, char opt,
+    ASN1_TLC *ctx, OSSL_LIB_CTX *libctx,
+    const char *propq);
 typedef int ASN1_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
-                        const ASN1_ITEM *it, int tag, int aclass);
+    const ASN1_ITEM *it, int tag, int aclass);
 typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
 typedef int ASN1_ex_new_ex_func(ASN1_VALUE **pval, const ASN1_ITEM *it,
-                                OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
 typedef int ASN1_ex_print_func(BIO *out, const ASN1_VALUE **pval,
-                               int indent, const char *fname,
-                               const ASN1_PCTX *pctx);
+    int indent, const char *fname,
+    const ASN1_PCTX *pctx);
 
 typedef int ASN1_primitive_i2c(const ASN1_VALUE **pval, unsigned char *cont,
-                               int *putype, const ASN1_ITEM *it);
+    int *putype, const ASN1_ITEM *it);
 typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont,
-                               int len, int utype, char *free_cont,
-                               const ASN1_ITEM *it);
+    int len, int utype, char *free_cont,
+    const ASN1_ITEM *it);
 typedef int ASN1_primitive_print(BIO *out, const ASN1_VALUE **pval,
-                                 const ASN1_ITEM *it, int indent,
-                                 const ASN1_PCTX *pctx);
+    const ASN1_ITEM *it, int indent,
+    const ASN1_PCTX *pctx);
 
 typedef struct ASN1_EXTERN_FUNCS_st {
     void *app_data;
@@ -696,17 +685,17 @@ typedef struct ASN1_PRIMITIVE_FUNCS_st {
  */
 
 typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it,
-                        void *exarg);
+    void *exarg);
 typedef int ASN1_aux_const_cb(int operation, const ASN1_VALUE **in,
-                              const ASN1_ITEM *it, void *exarg);
+    const ASN1_ITEM *it, void *exarg);
 
 typedef struct ASN1_AUX_st {
     void *app_data;
     int flags;
-    int ref_offset;             /* Offset of reference value */
-    int ref_lock;               /* Offset of lock value */
+    int ref_offset; /* Offset of reference value */
+    int ref_lock; /* Offset of lock value */
     ASN1_aux_cb *asn1_cb;
-    int enc_offset;             /* Offset of ASN1_ENCODING structure */
+    int enc_offset; /* Offset of ASN1_ENCODING structure */
     ASN1_aux_const_cb *asn1_const_cb; /* for ASN1_OP_I2D_ and ASN1_OP_PRINT_ */
 } ASN1_AUX;
 
@@ -730,143 +719,142 @@ typedef struct ASN1_STREAM_ARG_st {
 /* Flags in ASN1_AUX */
 
 /* Use a reference count */
-# define ASN1_AFLG_REFCOUNT      1
+#define ASN1_AFLG_REFCOUNT 1
 /* Save the encoding of structure (useful for signatures) */
-# define ASN1_AFLG_ENCODING      2
+#define ASN1_AFLG_ENCODING 2
 /* The Sequence length is invalid */
-# define ASN1_AFLG_BROKEN        4
+#define ASN1_AFLG_BROKEN 4
 /* Use the new asn1_const_cb */
-# define ASN1_AFLG_CONST_CB      8
+#define ASN1_AFLG_CONST_CB 8
 
 /* operation values for asn1_cb */
 
-# define ASN1_OP_NEW_PRE         0
-# define ASN1_OP_NEW_POST        1
-# define ASN1_OP_FREE_PRE        2
-# define ASN1_OP_FREE_POST       3
-# define ASN1_OP_D2I_PRE         4
-# define ASN1_OP_D2I_POST        5
-# define ASN1_OP_I2D_PRE         6
-# define ASN1_OP_I2D_POST        7
-# define ASN1_OP_PRINT_PRE       8
-# define ASN1_OP_PRINT_POST      9
-# define ASN1_OP_STREAM_PRE      10
-# define ASN1_OP_STREAM_POST     11
-# define ASN1_OP_DETACHED_PRE    12
-# define ASN1_OP_DETACHED_POST   13
-# define ASN1_OP_DUP_PRE         14
-# define ASN1_OP_DUP_POST        15
-# define ASN1_OP_GET0_LIBCTX     16
-# define ASN1_OP_GET0_PROPQ      17
+#define ASN1_OP_NEW_PRE 0
+#define ASN1_OP_NEW_POST 1
+#define ASN1_OP_FREE_PRE 2
+#define ASN1_OP_FREE_POST 3
+#define ASN1_OP_D2I_PRE 4
+#define ASN1_OP_D2I_POST 5
+#define ASN1_OP_I2D_PRE 6
+#define ASN1_OP_I2D_POST 7
+#define ASN1_OP_PRINT_PRE 8
+#define ASN1_OP_PRINT_POST 9
+#define ASN1_OP_STREAM_PRE 10
+#define ASN1_OP_STREAM_POST 11
+#define ASN1_OP_DETACHED_PRE 12
+#define ASN1_OP_DETACHED_POST 13
+#define ASN1_OP_DUP_PRE 14
+#define ASN1_OP_DUP_POST 15
+#define ASN1_OP_GET0_LIBCTX 16
+#define ASN1_OP_GET0_PROPQ 17
 
 /* Macro to implement a primitive type */
-# define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
-# define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
-                                ASN1_ITEM_end(itname)
+#define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
+#define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
+    ASN1_ITEM_start(itname)                       \
+        ASN1_ITYPE_PRIMITIVE,                     \
+        V_##vname, NULL, 0, NULL, ex, #itname ASN1_ITEM_end(itname)
 
 /* Macro to implement a multi string type */
-# define IMPLEMENT_ASN1_MSTRING(itname, mask) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
-                                ASN1_ITEM_end(itname)
+#define IMPLEMENT_ASN1_MSTRING(itname, mask) \
+    ASN1_ITEM_start(itname)                  \
+        ASN1_ITYPE_MSTRING,                  \
+        mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname ASN1_ITEM_end(itname)
 
-# define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_EXTERN, \
-                tag, \
-                NULL, \
-                0, \
-                &fptrs, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
+#define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
+    ASN1_ITEM_start(sname)                       \
+        ASN1_ITYPE_EXTERN,                       \
+        tag,                                     \
+        NULL,                                    \
+        0,                                       \
+        &fptrs,                                  \
+        0,                                       \
+        #sname ASN1_ITEM_end(sname)
 
 /* Macro to implement standard functions in terms of ASN1_ITEM structures */
 
-# define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
+#define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
 
-# define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
+#define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
 
-# define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
-                        IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
+#define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
+    IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
 
-# define IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(static, stname, stname, stname)
+#define IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(stname) \
+    IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(static, stname, stname, stname)
 
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
+#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
+    IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
 
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(pre, stname, itname, fname) \
-        pre stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        pre void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
+#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(pre, stname, itname, fname) \
+    pre stname *fname##_new(void)                                         \
+    {                                                                     \
+        return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname));           \
+    }                                                                     \
+    pre void fname##_free(stname *a)                                      \
+    {                                                                     \
+        ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname));          \
+    }
 
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
-        stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
+#define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
+    stname *fname##_new(void)                                       \
+    {                                                               \
+        return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname));     \
+    }                                                               \
+    void fname##_free(stname *a)                                    \
+    {                                                               \
+        ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname));    \
+    }
 
-# define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
+#define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname)    \
+    IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
+    IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
 
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(const stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((const ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
+#define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname)                       \
+    stname *d2i_##fname(stname **a, const unsigned char **in, long len)                    \
+    {                                                                                      \
+        return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname)); \
+    }                                                                                      \
+    int i2d_##fname(const stname *a, unsigned char **out)                                  \
+    {                                                                                      \
+        return ASN1_item_i2d((const ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));          \
+    }
 
-# define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
-        int i2d_##stname##_NDEF(const stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_ndef_i2d((const ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
-        }
+#define IMPLEMENT_ASN1_NDEF_FUNCTION(stname)                                           \
+    int i2d_##stname##_NDEF(const stname *a, unsigned char **out)                      \
+    {                                                                                  \
+        return ASN1_item_ndef_i2d((const ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname)); \
+    }
 
-# define IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(stname) \
-        static stname *d2i_##stname(stname **a, \
-                                   const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, \
-                                               ASN1_ITEM_rptr(stname)); \
-        } \
-        static int i2d_##stname(const stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((const ASN1_VALUE *)a, out, \
-                                     ASN1_ITEM_rptr(stname)); \
-        }
+#define IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(stname)            \
+    static stname *d2i_##stname(stname **a,                       \
+        const unsigned char **in, long len)                       \
+    {                                                             \
+        return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, \
+            ASN1_ITEM_rptr(stname));                              \
+    }                                                             \
+    static int i2d_##stname(const stname *a, unsigned char **out) \
+    {                                                             \
+        return ASN1_item_i2d((const ASN1_VALUE *)a, out,          \
+            ASN1_ITEM_rptr(stname));                              \
+    }
 
-# define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
-        stname * stname##_dup(const stname *x) \
-        { \
+#define IMPLEMENT_ASN1_DUP_FUNCTION(stname)              \
+    stname *stname##_dup(const stname *x)                \
+    {                                                    \
         return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
-        }
+    }
 
-# define IMPLEMENT_ASN1_PRINT_FUNCTION(stname) \
-        IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, stname, stname)
+#define IMPLEMENT_ASN1_PRINT_FUNCTION(stname) \
+    IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, stname, stname)
 
-# define IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, itname, fname) \
-        int fname##_print_ctx(BIO *out, const stname *x, int indent, \
-                                                const ASN1_PCTX *pctx) \
-        { \
-                return ASN1_item_print(out, (const ASN1_VALUE *)x, indent, \
-                        ASN1_ITEM_rptr(itname), pctx); \
-        }
+#define IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, itname, fname) \
+    int fname##_print_ctx(BIO *out, const stname *x, int indent,   \
+        const ASN1_PCTX *pctx)                                     \
+    {                                                              \
+        return ASN1_item_print(out, (const ASN1_VALUE *)x, indent, \
+            ASN1_ITEM_rptr(itname), pctx);                         \
+    }
 
 /* external definitions for primitive types */
 
@@ -885,7 +873,7 @@ DECLARE_ASN1_ITEM(ZINT64)
 DECLARE_ASN1_ITEM(UINT64)
 DECLARE_ASN1_ITEM(ZUINT64)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  * LONG and ZLONG are strongly discouraged for use as stored data, as the
  * underlying C type (long) differs in size depending on the architecture.
@@ -893,12 +881,13 @@ DECLARE_ASN1_ITEM(ZUINT64)
  */
 DECLARE_ASN1_ITEM(LONG)
 DECLARE_ASN1_ITEM(ZLONG)
-# endif
+#endif
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_VALUE");
 -}
-
+/* clang-format on */
 
 /* Functions used internally by the ASN1 code */
 
@@ -906,18 +895,18 @@ int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
 void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
 
 int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                     const ASN1_ITEM *it, int tag, int aclass, char opt,
-                     ASN1_TLC *ctx);
+    const ASN1_ITEM *it, int tag, int aclass, char opt,
+    ASN1_TLC *ctx);
 
 int ASN1_item_ex_i2d(const ASN1_VALUE **pval, unsigned char **out,
-                     const ASN1_ITEM *it, int tag, int aclass);
+    const ASN1_ITEM *it, int tag, int aclass);
 
 /* Legacy compatibility */
-# define IMPLEMENT_ASN1_FUNCTIONS_const(name) IMPLEMENT_ASN1_FUNCTIONS(name)
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-         IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname)
+#define IMPLEMENT_ASN1_FUNCTIONS_const(name) IMPLEMENT_ASN1_FUNCTIONS(name)
+#define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
+    IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname)
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/async.h b/include/openssl/async.h
index 826ffb993497..904438560f4d 100644
--- a/include/openssl/async.h
+++ b/include/openssl/async.h
@@ -10,44 +10,43 @@
 #include <stdlib.h>
 
 #ifndef OPENSSL_ASYNC_H
-# define OPENSSL_ASYNC_H
-# pragma once
+#define OPENSSL_ASYNC_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ASYNC_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ASYNC_H
+#endif
 
 #if defined(_WIN32)
-# if defined(BASETYPES) || defined(_WINDEF_H)
+#if defined(BASETYPES) || defined(_WINDEF_H)
 /* application has to include <windows.h> to use this */
-#define OSSL_ASYNC_FD       HANDLE
-#define OSSL_BAD_ASYNC_FD   INVALID_HANDLE_VALUE
-# endif
+#define OSSL_ASYNC_FD HANDLE
+#define OSSL_BAD_ASYNC_FD INVALID_HANDLE_VALUE
+#endif
 #else
-#define OSSL_ASYNC_FD       int
-#define OSSL_BAD_ASYNC_FD   -1
+#define OSSL_ASYNC_FD int
+#define OSSL_BAD_ASYNC_FD -1
 #endif
-# include <openssl/asyncerr.h>
-
+#include <openssl/asyncerr.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 typedef struct async_job_st ASYNC_JOB;
 typedef struct async_wait_ctx_st ASYNC_WAIT_CTX;
 typedef int (*ASYNC_callback_fn)(void *arg);
 
-#define ASYNC_ERR      0
-#define ASYNC_NO_JOBS  1
-#define ASYNC_PAUSE    2
-#define ASYNC_FINISH   3
+#define ASYNC_ERR 0
+#define ASYNC_NO_JOBS 1
+#define ASYNC_PAUSE 2
+#define ASYNC_FINISH 3
 
-#define ASYNC_STATUS_UNSUPPORTED    0
-#define ASYNC_STATUS_ERR            1
-#define ASYNC_STATUS_OK             2
-#define ASYNC_STATUS_EAGAIN         3
+#define ASYNC_STATUS_UNSUPPORTED 0
+#define ASYNC_STATUS_ERR 1
+#define ASYNC_STATUS_OK 2
+#define ASYNC_STATUS_EAGAIN 3
 
 int ASYNC_init_thread(size_t max_size, size_t init_size);
 void ASYNC_cleanup_thread(void);
@@ -56,25 +55,25 @@ void ASYNC_cleanup_thread(void);
 ASYNC_WAIT_CTX *ASYNC_WAIT_CTX_new(void);
 void ASYNC_WAIT_CTX_free(ASYNC_WAIT_CTX *ctx);
 int ASYNC_WAIT_CTX_set_wait_fd(ASYNC_WAIT_CTX *ctx, const void *key,
-                               OSSL_ASYNC_FD fd,
-                               void *custom_data,
-                               void (*cleanup)(ASYNC_WAIT_CTX *, const void *,
-                                               OSSL_ASYNC_FD, void *));
+    OSSL_ASYNC_FD fd,
+    void *custom_data,
+    void (*cleanup)(ASYNC_WAIT_CTX *, const void *,
+        OSSL_ASYNC_FD, void *));
 int ASYNC_WAIT_CTX_get_fd(ASYNC_WAIT_CTX *ctx, const void *key,
-                        OSSL_ASYNC_FD *fd, void **custom_data);
+    OSSL_ASYNC_FD *fd, void **custom_data);
 int ASYNC_WAIT_CTX_get_all_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *fd,
-                               size_t *numfds);
+    size_t *numfds);
 int ASYNC_WAIT_CTX_get_callback(ASYNC_WAIT_CTX *ctx,
-                                ASYNC_callback_fn *callback,
-                                void **callback_arg);
+    ASYNC_callback_fn *callback,
+    void **callback_arg);
 int ASYNC_WAIT_CTX_set_callback(ASYNC_WAIT_CTX *ctx,
-                                ASYNC_callback_fn callback,
-                                void *callback_arg);
+    ASYNC_callback_fn callback,
+    void *callback_arg);
 int ASYNC_WAIT_CTX_set_status(ASYNC_WAIT_CTX *ctx, int status);
 int ASYNC_WAIT_CTX_get_status(ASYNC_WAIT_CTX *ctx);
 int ASYNC_WAIT_CTX_get_changed_fds(ASYNC_WAIT_CTX *ctx, OSSL_ASYNC_FD *addfd,
-                                   size_t *numaddfds, OSSL_ASYNC_FD *delfd,
-                                   size_t *numdelfds);
+    size_t *numaddfds, OSSL_ASYNC_FD *delfd,
+    size_t *numdelfds);
 int ASYNC_WAIT_CTX_clear_fd(ASYNC_WAIT_CTX *ctx, const void *key);
 #endif
 
@@ -84,12 +83,12 @@ typedef void *(*ASYNC_stack_alloc_fn)(size_t *num);
 typedef void (*ASYNC_stack_free_fn)(void *addr);
 
 int ASYNC_set_mem_functions(ASYNC_stack_alloc_fn alloc_fn,
-                            ASYNC_stack_free_fn free_fn);
+    ASYNC_stack_free_fn free_fn);
 void ASYNC_get_mem_functions(ASYNC_stack_alloc_fn *alloc_fn,
-                             ASYNC_stack_free_fn *free_fn);
+    ASYNC_stack_free_fn *free_fn);
 
 int ASYNC_start_job(ASYNC_JOB **job, ASYNC_WAIT_CTX *ctx, int *ret,
-                    int (*func)(void *), void *args, size_t size);
+    int (*func)(void *), void *args, size_t size);
 int ASYNC_pause_job(void);
 
 ASYNC_JOB *ASYNC_get_current_job(void);
@@ -97,8 +96,7 @@ ASYNC_WAIT_CTX *ASYNC_get_wait_ctx(ASYNC_JOB *job);
 void ASYNC_block_pause(void);
 void ASYNC_unblock_pause(void);
 
-
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h
index c093f7be4547..41bd4a0391ad 100644
--- a/include/openssl/asyncerr.h
+++ b/include/openssl/asyncerr.h
@@ -9,21 +9,19 @@
  */
 
 #ifndef OPENSSL_ASYNCERR_H
-# define OPENSSL_ASYNCERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_ASYNCERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * ASYNC reason codes.
  */
-# define ASYNC_R_FAILED_TO_SET_POOL                       101
-# define ASYNC_R_FAILED_TO_SWAP_CONTEXT                   102
-# define ASYNC_R_INIT_FAILED                              105
-# define ASYNC_R_INVALID_POOL_SIZE                        103
+#define ASYNC_R_FAILED_TO_SET_POOL 101
+#define ASYNC_R_FAILED_TO_SWAP_CONTEXT 102
+#define ASYNC_R_INIT_FAILED 105
+#define ASYNC_R_INVALID_POOL_SIZE 103
 
 #endif
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
index 228e00e0a6dd..ba8e81e7084b 100644
--- a/include/openssl/bio.h.in
+++ b/include/openssl/bio.h.in
@@ -8,156 +8,158 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_BIO_H
-# define OPENSSL_BIO_H
-# pragma once
+#define OPENSSL_BIO_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BIO_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_BIO_H
+#endif
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <stdarg.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#include <stdarg.h>
 
-# include <openssl/crypto.h>
-# include <openssl/bioerr.h>
-# include <openssl/core.h>
+#include <openssl/crypto.h>
+#include <openssl/bioerr.h>
+#include <openssl/core.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /* There are the classes of BIOs */
-# define BIO_TYPE_DESCRIPTOR     0x0100 /* socket, fd, connect or accept */
-# define BIO_TYPE_FILTER         0x0200
-# define BIO_TYPE_SOURCE_SINK    0x0400
+#define BIO_TYPE_DESCRIPTOR 0x0100 /* socket, fd, connect or accept */
+#define BIO_TYPE_FILTER 0x0200
+#define BIO_TYPE_SOURCE_SINK 0x0400
 
 /* These are the 'types' of BIOs */
-# define BIO_TYPE_NONE             0
-# define BIO_TYPE_MEM            ( 1|BIO_TYPE_SOURCE_SINK)
-# define BIO_TYPE_FILE           ( 2|BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_NONE 0
+#define BIO_TYPE_MEM (1 | BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_FILE (2 | BIO_TYPE_SOURCE_SINK)
 
-# define BIO_TYPE_FD             ( 4|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_SOCKET         ( 5|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_NULL           ( 6|BIO_TYPE_SOURCE_SINK)
-# define BIO_TYPE_SSL            ( 7|BIO_TYPE_FILTER)
-# define BIO_TYPE_MD             ( 8|BIO_TYPE_FILTER)
-# define BIO_TYPE_BUFFER         ( 9|BIO_TYPE_FILTER)
-# define BIO_TYPE_CIPHER         (10|BIO_TYPE_FILTER)
-# define BIO_TYPE_BASE64         (11|BIO_TYPE_FILTER)
-# define BIO_TYPE_CONNECT        (12|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_ACCEPT         (13|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
+#define BIO_TYPE_FD (4 | BIO_TYPE_SOURCE_SINK | BIO_TYPE_DESCRIPTOR)
+#define BIO_TYPE_SOCKET (5 | BIO_TYPE_SOURCE_SINK | BIO_TYPE_DESCRIPTOR)
+#define BIO_TYPE_NULL (6 | BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_SSL (7 | BIO_TYPE_FILTER)
+#define BIO_TYPE_MD (8 | BIO_TYPE_FILTER)
+#define BIO_TYPE_BUFFER (9 | BIO_TYPE_FILTER)
+#define BIO_TYPE_CIPHER (10 | BIO_TYPE_FILTER)
+#define BIO_TYPE_BASE64 (11 | BIO_TYPE_FILTER)
+#define BIO_TYPE_CONNECT (12 | BIO_TYPE_SOURCE_SINK | BIO_TYPE_DESCRIPTOR)
+#define BIO_TYPE_ACCEPT (13 | BIO_TYPE_SOURCE_SINK | BIO_TYPE_DESCRIPTOR)
 
-# define BIO_TYPE_NBIO_TEST      (16|BIO_TYPE_FILTER)/* server proxy BIO */
-# define BIO_TYPE_NULL_FILTER    (17|BIO_TYPE_FILTER)
-# define BIO_TYPE_BIO            (19|BIO_TYPE_SOURCE_SINK)/* half a BIO pair */
-# define BIO_TYPE_LINEBUFFER     (20|BIO_TYPE_FILTER)
-# define BIO_TYPE_DGRAM          (21|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# define BIO_TYPE_ASN1           (22|BIO_TYPE_FILTER)
-# define BIO_TYPE_COMP           (23|BIO_TYPE_FILTER)
-# ifndef OPENSSL_NO_SCTP
-#  define BIO_TYPE_DGRAM_SCTP    (24|BIO_TYPE_SOURCE_SINK|BIO_TYPE_DESCRIPTOR)
-# endif
-# define BIO_TYPE_CORE_TO_PROV   (25|BIO_TYPE_SOURCE_SINK)
-# define BIO_TYPE_DGRAM_PAIR     (26|BIO_TYPE_SOURCE_SINK)
-# define BIO_TYPE_DGRAM_MEM      (27|BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_NBIO_TEST (16 | BIO_TYPE_FILTER) /* server proxy BIO */
+#define BIO_TYPE_NULL_FILTER (17 | BIO_TYPE_FILTER)
+#define BIO_TYPE_BIO (19 | BIO_TYPE_SOURCE_SINK) /* half a BIO pair */
+#define BIO_TYPE_LINEBUFFER (20 | BIO_TYPE_FILTER)
+#define BIO_TYPE_DGRAM (21 | BIO_TYPE_SOURCE_SINK | BIO_TYPE_DESCRIPTOR)
+#define BIO_TYPE_ASN1 (22 | BIO_TYPE_FILTER)
+#define BIO_TYPE_COMP (23 | BIO_TYPE_FILTER)
+#ifndef OPENSSL_NO_SCTP
+#define BIO_TYPE_DGRAM_SCTP (24 | BIO_TYPE_SOURCE_SINK | BIO_TYPE_DESCRIPTOR)
+#endif
+#define BIO_TYPE_CORE_TO_PROV (25 | BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_DGRAM_PAIR (26 | BIO_TYPE_SOURCE_SINK)
+#define BIO_TYPE_DGRAM_MEM (27 | BIO_TYPE_SOURCE_SINK)
 
 /* Custom type starting index returned by BIO_get_new_index() */
-#define BIO_TYPE_START           128
+#define BIO_TYPE_START 128
 /* Custom type maximum index that can be returned by BIO_get_new_index() */
-#define BIO_TYPE_MASK            0xFF
+#define BIO_TYPE_MASK 0xFF
 
 /*
  * BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
  * BIO_set_fp(in,stdin,BIO_NOCLOSE);
  */
-# define BIO_NOCLOSE             0x00
-# define BIO_CLOSE               0x01
+#define BIO_NOCLOSE 0x00
+#define BIO_CLOSE 0x01
 
 /*
  * These are used in the following macros and are passed to BIO_ctrl()
  */
-# define BIO_CTRL_RESET          1/* opt - rewind/zero etc */
-# define BIO_CTRL_EOF            2/* opt - are we at the eof */
-# define BIO_CTRL_INFO           3/* opt - extra tit-bits */
-# define BIO_CTRL_SET            4/* man - set the 'IO' type */
-# define BIO_CTRL_GET            5/* man - get the 'IO' type */
-# define BIO_CTRL_PUSH           6/* opt - internal, used to signify change */
-# define BIO_CTRL_POP            7/* opt - internal, used to signify change */
-# define BIO_CTRL_GET_CLOSE      8/* man - set the 'close' on free */
-# define BIO_CTRL_SET_CLOSE      9/* man - set the 'close' on free */
-# define BIO_CTRL_PENDING        10/* opt - is their more data buffered */
-# define BIO_CTRL_FLUSH          11/* opt - 'flush' buffered output */
-# define BIO_CTRL_DUP            12/* man - extra stuff for 'duped' BIO */
-# define BIO_CTRL_WPENDING       13/* opt - number of bytes still to write */
-# define BIO_CTRL_SET_CALLBACK   14/* opt - set callback function */
-# define BIO_CTRL_GET_CALLBACK   15/* opt - set callback function */
+#define BIO_CTRL_RESET 1 /* opt - rewind/zero etc */
+#define BIO_CTRL_EOF 2 /* opt - are we at the eof */
+#define BIO_CTRL_INFO 3 /* opt - extra tit-bits */
+#define BIO_CTRL_SET 4 /* man - set the 'IO' type */
+#define BIO_CTRL_GET 5 /* man - get the 'IO' type */
+#define BIO_CTRL_PUSH 6 /* opt - internal, used to signify change */
+#define BIO_CTRL_POP 7 /* opt - internal, used to signify change */
+#define BIO_CTRL_GET_CLOSE 8 /* man - set the 'close' on free */
+#define BIO_CTRL_SET_CLOSE 9 /* man - set the 'close' on free */
+#define BIO_CTRL_PENDING 10 /* opt - is their more data buffered */
+#define BIO_CTRL_FLUSH 11 /* opt - 'flush' buffered output */
+#define BIO_CTRL_DUP 12 /* man - extra stuff for 'duped' BIO */
+#define BIO_CTRL_WPENDING 13 /* opt - number of bytes still to write */
+#define BIO_CTRL_SET_CALLBACK 14 /* opt - set callback function */
+#define BIO_CTRL_GET_CALLBACK 15 /* opt - set callback function */
 
-# define BIO_CTRL_PEEK           29/* BIO_f_buffer special */
-# define BIO_CTRL_SET_FILENAME   30/* BIO_s_file special */
+#define BIO_CTRL_PEEK 29 /* BIO_f_buffer special */
+#define BIO_CTRL_SET_FILENAME 30 /* BIO_s_file special */
 
 /* dgram BIO stuff */
-# define BIO_CTRL_DGRAM_CONNECT       31/* BIO dgram special */
-# define BIO_CTRL_DGRAM_SET_CONNECTED 32/* allow for an externally connected
+#define BIO_CTRL_DGRAM_CONNECT 31 /* BIO dgram special */
+#define BIO_CTRL_DGRAM_SET_CONNECTED 32 /* allow for an externally connected \
                                          * socket to be passed in */
-# define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34/* getsockopt, essentially */
-# define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMEOUT 36/* getsockopt, essentially */
+#define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33 /* setsockopt, essentially */
+#define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34 /* getsockopt, essentially */
+#define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35 /* setsockopt, essentially */
+#define BIO_CTRL_DGRAM_GET_SEND_TIMEOUT 36 /* getsockopt, essentially */
 
-# define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37/* flag whether the last */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38/* I/O operation timed out */
+#define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37 /* flag whether the last */
+#define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38 /* I/O operation timed out */
 
 /* #ifdef IP_MTU_DISCOVER */
-# define BIO_CTRL_DGRAM_MTU_DISCOVER       39/* set DF bit on egress packets */
+#define BIO_CTRL_DGRAM_MTU_DISCOVER 39 /* set DF bit on egress packets */
 /* #endif */
 
-# define BIO_CTRL_DGRAM_QUERY_MTU          40/* as kernel for current MTU */
-# define BIO_CTRL_DGRAM_GET_FALLBACK_MTU   47
-# define BIO_CTRL_DGRAM_GET_MTU            41/* get cached value for MTU */
-# define BIO_CTRL_DGRAM_SET_MTU            42/* set cached value for MTU.
-                                              * want to use this if asking
-                                              * the kernel fails */
+#define BIO_CTRL_DGRAM_QUERY_MTU 40 /* as kernel for current MTU */
+#define BIO_CTRL_DGRAM_GET_FALLBACK_MTU 47
+#define BIO_CTRL_DGRAM_GET_MTU 41 /* get cached value for MTU */
+#define BIO_CTRL_DGRAM_SET_MTU 42 /* set cached value for MTU.  \
+                                   * want to use this if asking \
+                                   * the kernel fails */
 
-# define BIO_CTRL_DGRAM_MTU_EXCEEDED       43/* check whether the MTU was
-                                              * exceed in the previous write
-                                              * operation */
+#define BIO_CTRL_DGRAM_MTU_EXCEEDED 43 /* check whether the MTU was    \
+                                        * exceed in the previous write \
+                                        * operation */
 
-# define BIO_CTRL_DGRAM_GET_PEER           46
-# define BIO_CTRL_DGRAM_SET_PEER           44/* Destination for the data */
+#define BIO_CTRL_DGRAM_GET_PEER 46
+#define BIO_CTRL_DGRAM_SET_PEER 44 /* Destination for the data */
 
-# define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45/* Next DTLS handshake timeout
-                                              * to adjust socket timeouts */
-# define BIO_CTRL_DGRAM_SET_DONT_FRAG      48
+#define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT 45 /* Next DTLS handshake timeout \
+                                            * to adjust socket timeouts */
+#define BIO_CTRL_DGRAM_SET_DONT_FRAG 48
 
-# define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD   49
+#define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD 49
 
 /* Deliberately outside of OPENSSL_NO_SCTP - used in bss_dgram.c */
-#  define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE    50
-# ifndef OPENSSL_NO_SCTP
+#define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50
+#ifndef OPENSSL_NO_SCTP
 /* SCTP stuff */
-#  define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY                51
-#  define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY               52
-#  define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD               53
-#  define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO         60
-#  define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO         61
-#  define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO         62
-#  define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO         63
-#  define BIO_CTRL_DGRAM_SCTP_GET_PRINFO                  64
-#  define BIO_CTRL_DGRAM_SCTP_SET_PRINFO                  65
-#  define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN               70
-# endif
+#define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY 51
+#define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY 52
+#define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD 53
+#define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO 60
+#define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO 61
+#define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO 62
+#define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO 63
+#define BIO_CTRL_DGRAM_SCTP_GET_PRINFO 64
+#define BIO_CTRL_DGRAM_SCTP_SET_PRINFO 65
+#define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN 70
+#endif
 
-# define BIO_CTRL_DGRAM_SET_PEEK_MODE      71
+#define BIO_CTRL_DGRAM_SET_PEEK_MODE 71
 
 /*
  * internal BIO:
@@ -166,78 +168,78 @@ extern "C" {
  * # define BIO_CTRL_CLEAR_KTLS_CTRL_MSG           75
  */
 
-# define BIO_CTRL_GET_KTLS_SEND                 73
-# define BIO_CTRL_GET_KTLS_RECV                 76
+#define BIO_CTRL_GET_KTLS_SEND 73
+#define BIO_CTRL_GET_KTLS_RECV 76
 
-# define BIO_CTRL_DGRAM_SCTP_WAIT_FOR_DRY       77
-# define BIO_CTRL_DGRAM_SCTP_MSG_WAITING        78
+#define BIO_CTRL_DGRAM_SCTP_WAIT_FOR_DRY 77
+#define BIO_CTRL_DGRAM_SCTP_MSG_WAITING 78
 
 /* BIO_f_prefix controls */
-# define BIO_CTRL_SET_PREFIX                    79
-# define BIO_CTRL_SET_INDENT                    80
-# define BIO_CTRL_GET_INDENT                    81
+#define BIO_CTRL_SET_PREFIX 79
+#define BIO_CTRL_SET_INDENT 80
+#define BIO_CTRL_GET_INDENT 81
 
-# define BIO_CTRL_DGRAM_GET_LOCAL_ADDR_CAP      82
-# define BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE   83
-# define BIO_CTRL_DGRAM_SET_LOCAL_ADDR_ENABLE   84
-# define BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS      85
-# define BIO_CTRL_DGRAM_GET_CAPS                86
-# define BIO_CTRL_DGRAM_SET_CAPS                87
-# define BIO_CTRL_DGRAM_GET_NO_TRUNC            88
-# define BIO_CTRL_DGRAM_SET_NO_TRUNC            89
+#define BIO_CTRL_DGRAM_GET_LOCAL_ADDR_CAP 82
+#define BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE 83
+#define BIO_CTRL_DGRAM_SET_LOCAL_ADDR_ENABLE 84
+#define BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS 85
+#define BIO_CTRL_DGRAM_GET_CAPS 86
+#define BIO_CTRL_DGRAM_SET_CAPS 87
+#define BIO_CTRL_DGRAM_GET_NO_TRUNC 88
+#define BIO_CTRL_DGRAM_SET_NO_TRUNC 89
 
 /*
  * internal BIO:
  * # define BIO_CTRL_SET_KTLS_TX_ZEROCOPY_SENDFILE 90
  */
 
-# define BIO_CTRL_GET_RPOLL_DESCRIPTOR          91
-# define BIO_CTRL_GET_WPOLL_DESCRIPTOR          92
-# define BIO_CTRL_DGRAM_DETECT_PEER_ADDR        93
-# define BIO_CTRL_DGRAM_SET0_LOCAL_ADDR         94
+#define BIO_CTRL_GET_RPOLL_DESCRIPTOR 91
+#define BIO_CTRL_GET_WPOLL_DESCRIPTOR 92
+#define BIO_CTRL_DGRAM_DETECT_PEER_ADDR 93
+#define BIO_CTRL_DGRAM_SET0_LOCAL_ADDR 94
 
-# define BIO_DGRAM_CAP_NONE                 0U
-# define BIO_DGRAM_CAP_HANDLES_SRC_ADDR     (1U << 0)
-# define BIO_DGRAM_CAP_HANDLES_DST_ADDR     (1U << 1)
-# define BIO_DGRAM_CAP_PROVIDES_SRC_ADDR    (1U << 2)
-# define BIO_DGRAM_CAP_PROVIDES_DST_ADDR    (1U << 3)
+#define BIO_DGRAM_CAP_NONE 0U
+#define BIO_DGRAM_CAP_HANDLES_SRC_ADDR (1U << 0)
+#define BIO_DGRAM_CAP_HANDLES_DST_ADDR (1U << 1)
+#define BIO_DGRAM_CAP_PROVIDES_SRC_ADDR (1U << 2)
+#define BIO_DGRAM_CAP_PROVIDES_DST_ADDR (1U << 3)
 
-# ifndef OPENSSL_NO_KTLS
-#  define BIO_get_ktls_send(b)         \
-     (BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL) > 0)
-#  define BIO_get_ktls_recv(b)         \
-     (BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL) > 0)
-# else
-#  define BIO_get_ktls_send(b)  (0)
-#  define BIO_get_ktls_recv(b)  (0)
-# endif
+#ifndef OPENSSL_NO_KTLS
+#define BIO_get_ktls_send(b) \
+    (BIO_ctrl(b, BIO_CTRL_GET_KTLS_SEND, 0, NULL) > 0)
+#define BIO_get_ktls_recv(b) \
+    (BIO_ctrl(b, BIO_CTRL_GET_KTLS_RECV, 0, NULL) > 0)
+#else
+#define BIO_get_ktls_send(b) (0)
+#define BIO_get_ktls_recv(b) (0)
+#endif
 
 /* modifiers */
-# define BIO_FP_READ             0x02
-# define BIO_FP_WRITE            0x04
-# define BIO_FP_APPEND           0x08
-# define BIO_FP_TEXT             0x10
+#define BIO_FP_READ 0x02
+#define BIO_FP_WRITE 0x04
+#define BIO_FP_APPEND 0x08
+#define BIO_FP_TEXT 0x10
 
-# define BIO_FLAGS_READ          0x01
-# define BIO_FLAGS_WRITE         0x02
-# define BIO_FLAGS_IO_SPECIAL    0x04
-# define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
-# define BIO_FLAGS_SHOULD_RETRY  0x08
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#define BIO_FLAGS_READ 0x01
+#define BIO_FLAGS_WRITE 0x02
+#define BIO_FLAGS_IO_SPECIAL 0x04
+#define BIO_FLAGS_RWS (BIO_FLAGS_READ | BIO_FLAGS_WRITE | BIO_FLAGS_IO_SPECIAL)
+#define BIO_FLAGS_SHOULD_RETRY 0x08
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* This #define was replaced by an internal constant and should not be used. */
-#  define BIO_FLAGS_UPLINK       0
-# endif
+#define BIO_FLAGS_UPLINK 0
+#endif
 
-# define BIO_FLAGS_BASE64_NO_NL  0x100
+#define BIO_FLAGS_BASE64_NO_NL 0x100
 
 /*
  * This is used with memory BIOs:
  * BIO_FLAGS_MEM_RDONLY means we shouldn't free up or change the data in any way;
  * BIO_FLAGS_NONCLEAR_RST means we shouldn't clear data on reset.
  */
-# define BIO_FLAGS_MEM_RDONLY    0x200
-# define BIO_FLAGS_NONCLEAR_RST  0x400
-# define BIO_FLAGS_IN_EOF        0x800
+#define BIO_FLAGS_MEM_RDONLY 0x200
+#define BIO_FLAGS_NONCLEAR_RST 0x400
+#define BIO_FLAGS_IN_EOF 0x800
 
 /* the BIO FLAGS values 0x1000 to 0x8000 are reserved for internal KTLS flags */
 
@@ -249,26 +251,26 @@ void BIO_set_flags(BIO *b, int flags);
 int BIO_test_flags(const BIO *b, int flags);
 void BIO_clear_flags(BIO *b, int flags);
 
-# define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
-# define BIO_set_retry_special(b) \
-                BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_read(b) \
-                BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_write(b) \
-                BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
+#define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
+#define BIO_set_retry_special(b) \
+    BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL | BIO_FLAGS_SHOULD_RETRY))
+#define BIO_set_retry_read(b) \
+    BIO_set_flags(b, (BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY))
+#define BIO_set_retry_write(b) \
+    BIO_set_flags(b, (BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY))
 
 /* These are normally used internally in BIOs */
-# define BIO_clear_retry_flags(b) \
-                BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_get_retry_flags(b) \
-                BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
+#define BIO_clear_retry_flags(b) \
+    BIO_clear_flags(b, (BIO_FLAGS_RWS | BIO_FLAGS_SHOULD_RETRY))
+#define BIO_get_retry_flags(b) \
+    BIO_test_flags(b, (BIO_FLAGS_RWS | BIO_FLAGS_SHOULD_RETRY))
 
 /* These should be used by the application to tell why we should retry */
-# define BIO_should_read(a)              BIO_test_flags(a, BIO_FLAGS_READ)
-# define BIO_should_write(a)             BIO_test_flags(a, BIO_FLAGS_WRITE)
-# define BIO_should_io_special(a)        BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
-# define BIO_retry_type(a)               BIO_test_flags(a, BIO_FLAGS_RWS)
-# define BIO_should_retry(a)             BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
+#define BIO_should_read(a) BIO_test_flags(a, BIO_FLAGS_READ)
+#define BIO_should_write(a) BIO_test_flags(a, BIO_FLAGS_WRITE)
+#define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
+#define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS)
+#define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
 
 /*
  * The next three are used in conjunction with the BIO_should_io_special()
@@ -280,48 +282,48 @@ void BIO_clear_flags(BIO *b, int flags);
 /*
  * Returned from the SSL bio when the certificate retrieval code had an error
  */
-# define BIO_RR_SSL_X509_LOOKUP          0x01
+#define BIO_RR_SSL_X509_LOOKUP 0x01
 /* Returned from the connect BIO when a connect would have blocked */
-# define BIO_RR_CONNECT                  0x02
+#define BIO_RR_CONNECT 0x02
 /* Returned from the accept BIO when an accept would have blocked */
-# define BIO_RR_ACCEPT                   0x03
+#define BIO_RR_ACCEPT 0x03
 
 /* These are passed by the BIO callback */
-# define BIO_CB_FREE        0x01
-# define BIO_CB_READ        0x02
-# define BIO_CB_WRITE       0x03
-# define BIO_CB_PUTS        0x04
-# define BIO_CB_GETS        0x05
-# define BIO_CB_CTRL        0x06
-# define BIO_CB_RECVMMSG    0x07
-# define BIO_CB_SENDMMSG    0x08
+#define BIO_CB_FREE 0x01
+#define BIO_CB_READ 0x02
+#define BIO_CB_WRITE 0x03
+#define BIO_CB_PUTS 0x04
+#define BIO_CB_GETS 0x05
+#define BIO_CB_CTRL 0x06
+#define BIO_CB_RECVMMSG 0x07
+#define BIO_CB_SENDMMSG 0x08
 
 /*
  * The callback is called before and after the underling operation, The
  * BIO_CB_RETURN flag indicates if it is after the call
  */
-# define BIO_CB_RETURN   0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
-# define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
-# define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
+#define BIO_CB_RETURN 0x80
+#define BIO_CB_return(a) ((a) | BIO_CB_RETURN)
+#define BIO_cb_pre(a) (!((a) & BIO_CB_RETURN))
+#define BIO_cb_post(a) ((a) & BIO_CB_RETURN)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef long (*BIO_callback_fn)(BIO *b, int oper, const char *argp, int argi,
-                                long argl, long ret);
+    long argl, long ret);
 OSSL_DEPRECATEDIN_3_0 BIO_callback_fn BIO_get_callback(const BIO *b);
 OSSL_DEPRECATEDIN_3_0 void BIO_set_callback(BIO *b, BIO_callback_fn callback);
 OSSL_DEPRECATEDIN_3_0 long BIO_debug_callback(BIO *bio, int cmd,
-                                               const char *argp, int argi,
-                                               long argl, long ret);
-# endif
+    const char *argp, int argi,
+    long argl, long ret);
+#endif
 
 typedef long (*BIO_callback_fn_ex)(BIO *b, int oper, const char *argp,
-                                   size_t len, int argi,
-                                   long argl, int ret, size_t *processed);
+    size_t len, int argi,
+    long argl, int ret, size_t *processed);
 BIO_callback_fn_ex BIO_get_callback_ex(const BIO *b);
 void BIO_set_callback_ex(BIO *b, BIO_callback_fn_ex callback);
 long BIO_debug_callback_ex(BIO *bio, int oper, const char *argp, size_t len,
-                           int argi, long argl, int ret, size_t *processed);
+    int argi, long argl, int ret, size_t *processed);
 
 char *BIO_get_callback_arg(const BIO *b);
 void BIO_set_callback_arg(BIO *b, char *arg);
@@ -332,21 +334,22 @@ const char *BIO_method_name(const BIO *b);
 int BIO_method_type(const BIO *b);
 
 typedef int BIO_info_cb(BIO *, int, int);
-typedef BIO_info_cb bio_info_cb;  /* backward compatibility */
+typedef BIO_info_cb bio_info_cb; /* backward compatibility */
 
+/* clang-format off */
 {-
     generate_stack_macros("BIO");
 -}
-
+/* clang-format on */
 
 /* Prefix and suffix callback in ASN1 BIO */
-typedef int asn1_ps_func (BIO *b, unsigned char **pbuf, int *plen,
-                          void *parg);
+typedef int asn1_ps_func(BIO *b, unsigned char **pbuf, int *plen,
+    void *parg);
 
-typedef void (*BIO_dgram_sctp_notification_handler_fn) (BIO *b,
-                                                        void *context,
-                                                        void *buf);
-# ifndef OPENSSL_NO_SCTP
+typedef void (*BIO_dgram_sctp_notification_handler_fn)(BIO *b,
+    void *context,
+    void *buf);
+#ifndef OPENSSL_NO_SCTP
 /* SCTP parameter structs */
 struct bio_dgram_sctp_sndinfo {
     uint16_t snd_sid;
@@ -369,7 +372,7 @@ struct bio_dgram_sctp_prinfo {
     uint16_t pr_policy;
     uint32_t pr_value;
 };
-# endif
+#endif
 
 /* BIO_sendmmsg/BIO_recvmmsg-related definitions */
 typedef struct bio_msg_st {
@@ -380,24 +383,24 @@ typedef struct bio_msg_st {
 } BIO_MSG;
 
 typedef struct bio_mmsg_cb_args_st {
-    BIO_MSG    *msg;
-    size_t      stride, num_msg;
-    uint64_t    flags;
-    size_t     *msgs_processed;
+    BIO_MSG *msg;
+    size_t stride, num_msg;
+    uint64_t flags;
+    size_t *msgs_processed;
 } BIO_MMSG_CB_ARGS;
 
-#define BIO_POLL_DESCRIPTOR_TYPE_NONE       0
-#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD    1
-#define BIO_POLL_DESCRIPTOR_TYPE_SSL        2
-#define BIO_POLL_DESCRIPTOR_CUSTOM_START    8192
+#define BIO_POLL_DESCRIPTOR_TYPE_NONE 0
+#define BIO_POLL_DESCRIPTOR_TYPE_SOCK_FD 1
+#define BIO_POLL_DESCRIPTOR_TYPE_SSL 2
+#define BIO_POLL_DESCRIPTOR_CUSTOM_START 8192
 
 typedef struct bio_poll_descriptor_st {
     uint32_t type;
     union {
-        int         fd;
-        void        *custom;
-        uintptr_t   custom_ui;
-        SSL         *ssl;
+        int fd;
+        void *custom;
+        uintptr_t custom_ui;
+        SSL *ssl;
     } value;
 } BIO_POLL_DESCRIPTOR;
 
@@ -405,167 +408,167 @@ typedef struct bio_poll_descriptor_st {
  * #define BIO_CONN_get_param_hostname BIO_ctrl
  */
 
-# define BIO_C_SET_CONNECT                       100
-# define BIO_C_DO_STATE_MACHINE                  101
-# define BIO_C_SET_NBIO                          102
+#define BIO_C_SET_CONNECT 100
+#define BIO_C_DO_STATE_MACHINE 101
+#define BIO_C_SET_NBIO 102
 /* # define BIO_C_SET_PROXY_PARAM                   103 */
-# define BIO_C_SET_FD                            104
-# define BIO_C_GET_FD                            105
-# define BIO_C_SET_FILE_PTR                      106
-# define BIO_C_GET_FILE_PTR                      107
-# define BIO_C_SET_FILENAME                      108
-# define BIO_C_SET_SSL                           109
-# define BIO_C_GET_SSL                           110
-# define BIO_C_SET_MD                            111
-# define BIO_C_GET_MD                            112
-# define BIO_C_GET_CIPHER_STATUS                 113
-# define BIO_C_SET_BUF_MEM                       114
-# define BIO_C_GET_BUF_MEM_PTR                   115
-# define BIO_C_GET_BUFF_NUM_LINES                116
-# define BIO_C_SET_BUFF_SIZE                     117
-# define BIO_C_SET_ACCEPT                        118
-# define BIO_C_SSL_MODE                          119
-# define BIO_C_GET_MD_CTX                        120
+#define BIO_C_SET_FD 104
+#define BIO_C_GET_FD 105
+#define BIO_C_SET_FILE_PTR 106
+#define BIO_C_GET_FILE_PTR 107
+#define BIO_C_SET_FILENAME 108
+#define BIO_C_SET_SSL 109
+#define BIO_C_GET_SSL 110
+#define BIO_C_SET_MD 111
+#define BIO_C_GET_MD 112
+#define BIO_C_GET_CIPHER_STATUS 113
+#define BIO_C_SET_BUF_MEM 114
+#define BIO_C_GET_BUF_MEM_PTR 115
+#define BIO_C_GET_BUFF_NUM_LINES 116
+#define BIO_C_SET_BUFF_SIZE 117
+#define BIO_C_SET_ACCEPT 118
+#define BIO_C_SSL_MODE 119
+#define BIO_C_GET_MD_CTX 120
 /* # define BIO_C_GET_PROXY_PARAM                   121 */
-# define BIO_C_SET_BUFF_READ_DATA                122/* data to read first */
-# define BIO_C_GET_CONNECT                       123
-# define BIO_C_GET_ACCEPT                        124
-# define BIO_C_SET_SSL_RENEGOTIATE_BYTES         125
-# define BIO_C_GET_SSL_NUM_RENEGOTIATES          126
-# define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT       127
-# define BIO_C_FILE_SEEK                         128
-# define BIO_C_GET_CIPHER_CTX                    129
-# define BIO_C_SET_BUF_MEM_EOF_RETURN            130/* return end of input
-                                                     * value */
-# define BIO_C_SET_BIND_MODE                     131
-# define BIO_C_GET_BIND_MODE                     132
-# define BIO_C_FILE_TELL                         133
-# define BIO_C_GET_SOCKS                         134
-# define BIO_C_SET_SOCKS                         135
+#define BIO_C_SET_BUFF_READ_DATA 122 /* data to read first */
+#define BIO_C_GET_CONNECT 123
+#define BIO_C_GET_ACCEPT 124
+#define BIO_C_SET_SSL_RENEGOTIATE_BYTES 125
+#define BIO_C_GET_SSL_NUM_RENEGOTIATES 126
+#define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT 127
+#define BIO_C_FILE_SEEK 128
+#define BIO_C_GET_CIPHER_CTX 129
+#define BIO_C_SET_BUF_MEM_EOF_RETURN 130 /* return end of input \
+                                          * value */
+#define BIO_C_SET_BIND_MODE 131
+#define BIO_C_GET_BIND_MODE 132
+#define BIO_C_FILE_TELL 133
+#define BIO_C_GET_SOCKS 134
+#define BIO_C_SET_SOCKS 135
 
-# define BIO_C_SET_WRITE_BUF_SIZE                136/* for BIO_s_bio */
-# define BIO_C_GET_WRITE_BUF_SIZE                137
-# define BIO_C_MAKE_BIO_PAIR                     138
-# define BIO_C_DESTROY_BIO_PAIR                  139
-# define BIO_C_GET_WRITE_GUARANTEE               140
-# define BIO_C_GET_READ_REQUEST                  141
-# define BIO_C_SHUTDOWN_WR                       142
-# define BIO_C_NREAD0                            143
-# define BIO_C_NREAD                             144
-# define BIO_C_NWRITE0                           145
-# define BIO_C_NWRITE                            146
-# define BIO_C_RESET_READ_REQUEST                147
-# define BIO_C_SET_MD_CTX                        148
+#define BIO_C_SET_WRITE_BUF_SIZE 136 /* for BIO_s_bio */
+#define BIO_C_GET_WRITE_BUF_SIZE 137
+#define BIO_C_MAKE_BIO_PAIR 138
+#define BIO_C_DESTROY_BIO_PAIR 139
+#define BIO_C_GET_WRITE_GUARANTEE 140
+#define BIO_C_GET_READ_REQUEST 141
+#define BIO_C_SHUTDOWN_WR 142
+#define BIO_C_NREAD0 143
+#define BIO_C_NREAD 144
+#define BIO_C_NWRITE0 145
+#define BIO_C_NWRITE 146
+#define BIO_C_RESET_READ_REQUEST 147
+#define BIO_C_SET_MD_CTX 148
 
-# define BIO_C_SET_PREFIX                        149
-# define BIO_C_GET_PREFIX                        150
-# define BIO_C_SET_SUFFIX                        151
-# define BIO_C_GET_SUFFIX                        152
+#define BIO_C_SET_PREFIX 149
+#define BIO_C_GET_PREFIX 150
+#define BIO_C_SET_SUFFIX 151
+#define BIO_C_GET_SUFFIX 152
 
-# define BIO_C_SET_EX_ARG                        153
-# define BIO_C_GET_EX_ARG                        154
+#define BIO_C_SET_EX_ARG 153
+#define BIO_C_GET_EX_ARG 154
 
-# define BIO_C_SET_CONNECT_MODE                  155
+#define BIO_C_SET_CONNECT_MODE 155
 
-# define BIO_C_SET_TFO                           156 /* like BIO_C_SET_NBIO */
+#define BIO_C_SET_TFO 156 /* like BIO_C_SET_NBIO */
 
-# define BIO_C_SET_SOCK_TYPE                     157
-# define BIO_C_GET_SOCK_TYPE                     158
-# define BIO_C_GET_DGRAM_BIO                     159
+#define BIO_C_SET_SOCK_TYPE 157
+#define BIO_C_GET_SOCK_TYPE 158
+#define BIO_C_GET_DGRAM_BIO 159
 
-# define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,arg)
-# define BIO_get_app_data(s)             BIO_get_ex_data(s,0)
+#define BIO_set_app_data(s, arg) BIO_set_ex_data(s, 0, arg)
+#define BIO_get_app_data(s) BIO_get_ex_data(s, 0)
 
-# define BIO_set_nbio(b,n)               BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-# define BIO_set_tfo(b,n)                BIO_ctrl(b,BIO_C_SET_TFO,(n),NULL)
+#define BIO_set_nbio(b, n) BIO_ctrl(b, BIO_C_SET_NBIO, (n), NULL)
+#define BIO_set_tfo(b, n) BIO_ctrl(b, BIO_C_SET_TFO, (n), NULL)
 
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 /* IP families we support, for BIO_s_connect() and BIO_s_accept() */
 /* Note: the underlying operating system may not support some of them */
-#  define BIO_FAMILY_IPV4                         4
-#  define BIO_FAMILY_IPV6                         6
-#  define BIO_FAMILY_IPANY                        256
+#define BIO_FAMILY_IPV4 4
+#define BIO_FAMILY_IPV6 6
+#define BIO_FAMILY_IPANY 256
 
 /* BIO_s_connect() */
-#  define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0, \
-                                                 (char *)(name))
-#  define BIO_set_conn_port(b,port)     BIO_ctrl(b,BIO_C_SET_CONNECT,1, \
-                                                 (char *)(port))
-#  define BIO_set_conn_address(b,addr)  BIO_ctrl(b,BIO_C_SET_CONNECT,2, \
-                                                 (char *)(addr))
-#  define BIO_set_conn_ip_family(b,f)   BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
-#  define BIO_get_conn_hostname(b)      ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))
-#  define BIO_get_conn_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
-#  define BIO_get_conn_address(b)       ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2))
-#  define BIO_get_conn_ip_family(b)     BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
-#  define BIO_get_conn_mode(b)          BIO_ctrl(b,BIO_C_GET_CONNECT,4,NULL)
-#  define BIO_set_conn_mode(b,n)        BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
-#  define BIO_set_sock_type(b,t)        BIO_ctrl(b,BIO_C_SET_SOCK_TYPE,(t),NULL)
-#  define BIO_get_sock_type(b)          BIO_ctrl(b,BIO_C_GET_SOCK_TYPE,0,NULL)
-#  define BIO_get0_dgram_bio(b, p)      BIO_ctrl(b,BIO_C_GET_DGRAM_BIO,0,(void *)(BIO **)(p))
+#define BIO_set_conn_hostname(b, name) BIO_ctrl(b, BIO_C_SET_CONNECT, 0, \
+    (char *)(name))
+#define BIO_set_conn_port(b, port) BIO_ctrl(b, BIO_C_SET_CONNECT, 1, \
+    (char *)(port))
+#define BIO_set_conn_address(b, addr) BIO_ctrl(b, BIO_C_SET_CONNECT, 2, \
+    (char *)(addr))
+#define BIO_set_conn_ip_family(b, f) BIO_int_ctrl(b, BIO_C_SET_CONNECT, 3, f)
+#define BIO_get_conn_hostname(b) ((const char *)BIO_ptr_ctrl(b, BIO_C_GET_CONNECT, 0))
+#define BIO_get_conn_port(b) ((const char *)BIO_ptr_ctrl(b, BIO_C_GET_CONNECT, 1))
+#define BIO_get_conn_address(b) ((const BIO_ADDR *)BIO_ptr_ctrl(b, BIO_C_GET_CONNECT, 2))
+#define BIO_get_conn_ip_family(b) BIO_ctrl(b, BIO_C_GET_CONNECT, 3, NULL)
+#define BIO_get_conn_mode(b) BIO_ctrl(b, BIO_C_GET_CONNECT, 4, NULL)
+#define BIO_set_conn_mode(b, n) BIO_ctrl(b, BIO_C_SET_CONNECT_MODE, (n), NULL)
+#define BIO_set_sock_type(b, t) BIO_ctrl(b, BIO_C_SET_SOCK_TYPE, (t), NULL)
+#define BIO_get_sock_type(b) BIO_ctrl(b, BIO_C_GET_SOCK_TYPE, 0, NULL)
+#define BIO_get0_dgram_bio(b, p) BIO_ctrl(b, BIO_C_GET_DGRAM_BIO, 0, (void *)(BIO **)(p))
 
 /* BIO_s_accept() */
-#  define BIO_set_accept_name(b,name)   BIO_ctrl(b,BIO_C_SET_ACCEPT,0, \
-                                                 (char *)(name))
-#  define BIO_set_accept_port(b,port)   BIO_ctrl(b,BIO_C_SET_ACCEPT,1, \
-                                                 (char *)(port))
-#  define BIO_get_accept_name(b)        ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0))
-#  define BIO_get_accept_port(b)        ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,1))
-#  define BIO_get_peer_name(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,2))
-#  define BIO_get_peer_port(b)          ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,3))
+#define BIO_set_accept_name(b, name) BIO_ctrl(b, BIO_C_SET_ACCEPT, 0, \
+    (char *)(name))
+#define BIO_set_accept_port(b, port) BIO_ctrl(b, BIO_C_SET_ACCEPT, 1, \
+    (char *)(port))
+#define BIO_get_accept_name(b) ((const char *)BIO_ptr_ctrl(b, BIO_C_GET_ACCEPT, 0))
+#define BIO_get_accept_port(b) ((const char *)BIO_ptr_ctrl(b, BIO_C_GET_ACCEPT, 1))
+#define BIO_get_peer_name(b) ((const char *)BIO_ptr_ctrl(b, BIO_C_GET_ACCEPT, 2))
+#define BIO_get_peer_port(b) ((const char *)BIO_ptr_ctrl(b, BIO_C_GET_ACCEPT, 3))
 /* #define BIO_set_nbio(b,n)    BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-#  define BIO_set_nbio_accept(b,n)      BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(n)?(void *)"a":NULL)
-#  define BIO_set_accept_bios(b,bio)    BIO_ctrl(b,BIO_C_SET_ACCEPT,3, \
-                                                 (char *)(bio))
-#  define BIO_set_accept_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_ACCEPT,4,f)
-#  define BIO_get_accept_ip_family(b)   BIO_ctrl(b,BIO_C_GET_ACCEPT,4,NULL)
-#  define BIO_set_tfo_accept(b,n)       BIO_ctrl(b,BIO_C_SET_ACCEPT,5,(n)?(void *)"a":NULL)
+#define BIO_set_nbio_accept(b, n) BIO_ctrl(b, BIO_C_SET_ACCEPT, 2, (n) ? (void *)"a" : NULL)
+#define BIO_set_accept_bios(b, bio) BIO_ctrl(b, BIO_C_SET_ACCEPT, 3, \
+    (char *)(bio))
+#define BIO_set_accept_ip_family(b, f) BIO_int_ctrl(b, BIO_C_SET_ACCEPT, 4, f)
+#define BIO_get_accept_ip_family(b) BIO_ctrl(b, BIO_C_GET_ACCEPT, 4, NULL)
+#define BIO_set_tfo_accept(b, n) BIO_ctrl(b, BIO_C_SET_ACCEPT, 5, (n) ? (void *)"a" : NULL)
 
 /* Aliases kept for backward compatibility */
-#  define BIO_BIND_NORMAL                 0
-#  define BIO_BIND_REUSEADDR              BIO_SOCK_REUSEADDR
-#  define BIO_BIND_REUSEADDR_IF_UNUSED    BIO_SOCK_REUSEADDR
-#  define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-#  define BIO_get_bind_mode(b)    BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-# endif /* OPENSSL_NO_SOCK */
+#define BIO_BIND_NORMAL 0
+#define BIO_BIND_REUSEADDR BIO_SOCK_REUSEADDR
+#define BIO_BIND_REUSEADDR_IF_UNUSED BIO_SOCK_REUSEADDR
+#define BIO_set_bind_mode(b, mode) BIO_ctrl(b, BIO_C_SET_BIND_MODE, mode, NULL)
+#define BIO_get_bind_mode(b) BIO_ctrl(b, BIO_C_GET_BIND_MODE, 0, NULL)
+#endif /* OPENSSL_NO_SOCK */
 
-# define BIO_do_connect(b)       BIO_do_handshake(b)
-# define BIO_do_accept(b)        BIO_do_handshake(b)
+#define BIO_do_connect(b) BIO_do_handshake(b)
+#define BIO_do_accept(b) BIO_do_handshake(b)
 
-# define BIO_do_handshake(b)     BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
+#define BIO_do_handshake(b) BIO_ctrl(b, BIO_C_DO_STATE_MACHINE, 0, NULL)
 
 /* BIO_s_datagram(), BIO_s_fd(), BIO_s_socket(), BIO_s_accept() and BIO_s_connect() */
-# define BIO_set_fd(b,fd,c)      BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
-# define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)(c))
+#define BIO_set_fd(b, fd, c) BIO_int_ctrl(b, BIO_C_SET_FD, c, fd)
+#define BIO_get_fd(b, c) BIO_ctrl(b, BIO_C_GET_FD, 0, (char *)(c))
 
 /* BIO_s_file() */
-# define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)(fp))
-# define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)(fpp))
+#define BIO_set_fp(b, fp, c) BIO_ctrl(b, BIO_C_SET_FILE_PTR, c, (char *)(fp))
+#define BIO_get_fp(b, fpp) BIO_ctrl(b, BIO_C_GET_FILE_PTR, 0, (char *)(fpp))
 
 /* BIO_s_fd() and BIO_s_file() */
-# define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
-# define BIO_tell(b)     (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
+#define BIO_seek(b, ofs) (int)BIO_ctrl(b, BIO_C_FILE_SEEK, ofs, NULL)
+#define BIO_tell(b) (int)BIO_ctrl(b, BIO_C_FILE_TELL, 0, NULL)
 
 /*
  * name is cast to lose const, but might be better to route through a
  * function so we can do it safely
  */
-# ifdef CONST_STRICT
+#ifdef CONST_STRICT
 /*
  * If you are wondering why this isn't defined, its because CONST_STRICT is
  * purely a compile-time kludge to allow const to be checked.
  */
 int BIO_read_filename(BIO *b, const char *name);
-# else
-#  define BIO_read_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ,(char *)(name))
-# endif
-# define BIO_write_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_WRITE,name)
-# define BIO_append_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_APPEND,name)
-# define BIO_rw_filename(b,name) (int)BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
+#else
+#define BIO_read_filename(b, name) (int)BIO_ctrl(b, BIO_C_SET_FILENAME, \
+    BIO_CLOSE | BIO_FP_READ, (char *)(name))
+#endif
+#define BIO_write_filename(b, name) (int)BIO_ctrl(b, BIO_C_SET_FILENAME, \
+    BIO_CLOSE | BIO_FP_WRITE, name)
+#define BIO_append_filename(b, name) (int)BIO_ctrl(b, BIO_C_SET_FILENAME, \
+    BIO_CLOSE | BIO_FP_APPEND, name)
+#define BIO_rw_filename(b, name) (int)BIO_ctrl(b, BIO_C_SET_FILENAME, \
+    BIO_CLOSE | BIO_FP_READ | BIO_FP_WRITE, name)
 
 /*
  * WARNING WARNING, this ups the reference count on the read bio of the SSL
@@ -573,111 +576,111 @@ int BIO_read_filename(BIO *b, const char *name);
  * next_bio field in the bio.  So when you free the BIO, make sure you are
  * doing a BIO_free_all() to catch the underlying BIO.
  */
-# define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)(ssl))
-# define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)(sslp))
-# define BIO_set_ssl_mode(b,client)      BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
-# define BIO_set_ssl_renegotiate_bytes(b,num) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL)
-# define BIO_get_num_renegotiates(b) \
-        BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL)
-# define BIO_set_ssl_renegotiate_timeout(b,seconds) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL)
+#define BIO_set_ssl(b, ssl, c) BIO_ctrl(b, BIO_C_SET_SSL, c, (char *)(ssl))
+#define BIO_get_ssl(b, sslp) BIO_ctrl(b, BIO_C_GET_SSL, 0, (char *)(sslp))
+#define BIO_set_ssl_mode(b, client) BIO_ctrl(b, BIO_C_SSL_MODE, client, NULL)
+#define BIO_set_ssl_renegotiate_bytes(b, num) \
+    BIO_ctrl(b, BIO_C_SET_SSL_RENEGOTIATE_BYTES, num, NULL)
+#define BIO_get_num_renegotiates(b) \
+    BIO_ctrl(b, BIO_C_GET_SSL_NUM_RENEGOTIATES, 0, NULL)
+#define BIO_set_ssl_renegotiate_timeout(b, seconds) \
+    BIO_ctrl(b, BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT, seconds, NULL)
 
 /* defined in evp.h */
 /* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)(md)) */
 
-# define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)(pp))
-# define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)(bm))
-# define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0, \
-                                          (char *)(pp))
-# define BIO_set_mem_eof_return(b,v) \
-                                BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
+#define BIO_get_mem_data(b, pp) BIO_ctrl(b, BIO_CTRL_INFO, 0, (char *)(pp))
+#define BIO_set_mem_buf(b, bm, c) BIO_ctrl(b, BIO_C_SET_BUF_MEM, c, (char *)(bm))
+#define BIO_get_mem_ptr(b, pp) BIO_ctrl(b, BIO_C_GET_BUF_MEM_PTR, 0, \
+    (char *)(pp))
+#define BIO_set_mem_eof_return(b, v) \
+    BIO_ctrl(b, BIO_C_SET_BUF_MEM_EOF_RETURN, v, NULL)
 
 /* For the BIO_f_buffer() type */
-# define BIO_get_buffer_num_lines(b)     BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
-# define BIO_set_buffer_size(b,size)     BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
-# define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
-# define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
-# define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
+#define BIO_get_buffer_num_lines(b) BIO_ctrl(b, BIO_C_GET_BUFF_NUM_LINES, 0, NULL)
+#define BIO_set_buffer_size(b, size) BIO_ctrl(b, BIO_C_SET_BUFF_SIZE, size, NULL)
+#define BIO_set_read_buffer_size(b, size) BIO_int_ctrl(b, BIO_C_SET_BUFF_SIZE, size, 0)
+#define BIO_set_write_buffer_size(b, size) BIO_int_ctrl(b, BIO_C_SET_BUFF_SIZE, size, 1)
+#define BIO_set_buffer_read_data(b, buf, num) BIO_ctrl(b, BIO_C_SET_BUFF_READ_DATA, num, buf)
 
 /* Don't use the next one unless you know what you are doing :-) */
-# define BIO_dup_state(b,ret)    BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
+#define BIO_dup_state(b, ret) BIO_ctrl(b, BIO_CTRL_DUP, 0, (char *)(ret))
 
-# define BIO_reset(b)            (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
-# define BIO_eof(b)              (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
-# define BIO_set_close(b,c)      (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
-# define BIO_get_close(b)        (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
-# define BIO_pending(b)          (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-# define BIO_wpending(b)         (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
+#define BIO_reset(b) (int)BIO_ctrl(b, BIO_CTRL_RESET, 0, NULL)
+#define BIO_eof(b) (int)BIO_ctrl(b, BIO_CTRL_EOF, 0, NULL)
+#define BIO_set_close(b, c) (int)BIO_ctrl(b, BIO_CTRL_SET_CLOSE, (c), NULL)
+#define BIO_get_close(b) (int)BIO_ctrl(b, BIO_CTRL_GET_CLOSE, 0, NULL)
+#define BIO_pending(b) (int)BIO_ctrl(b, BIO_CTRL_PENDING, 0, NULL)
+#define BIO_wpending(b) (int)BIO_ctrl(b, BIO_CTRL_WPENDING, 0, NULL)
 /* ...pending macros have inappropriate return type */
 size_t BIO_ctrl_pending(BIO *b);
 size_t BIO_ctrl_wpending(BIO *b);
-# define BIO_flush(b)            (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
-# define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \
-                                                   cbp)
-# define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb)
+#define BIO_flush(b) (int)BIO_ctrl(b, BIO_CTRL_FLUSH, 0, NULL)
+#define BIO_get_info_callback(b, cbp) (int)BIO_ctrl(b, BIO_CTRL_GET_CALLBACK, 0, \
+    cbp)
+#define BIO_set_info_callback(b, cb) (int)BIO_callback_ctrl(b, BIO_CTRL_SET_CALLBACK, cb)
 
 /* For the BIO_f_buffer() type */
-# define BIO_buffer_get_num_lines(b) BIO_ctrl(b,BIO_CTRL_GET,0,NULL)
-# define BIO_buffer_peek(b,s,l) BIO_ctrl(b,BIO_CTRL_PEEK,(l),(s))
+#define BIO_buffer_get_num_lines(b) BIO_ctrl(b, BIO_CTRL_GET, 0, NULL)
+#define BIO_buffer_peek(b, s, l) BIO_ctrl(b, BIO_CTRL_PEEK, (l), (s))
 
 /* For BIO_s_bio() */
-# define BIO_set_write_buf_size(b,size) (int)BIO_ctrl(b,BIO_C_SET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_get_write_buf_size(b,size) (size_t)BIO_ctrl(b,BIO_C_GET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_make_bio_pair(b1,b2)   (int)BIO_ctrl(b1,BIO_C_MAKE_BIO_PAIR,0,b2)
-# define BIO_destroy_bio_pair(b)    (int)BIO_ctrl(b,BIO_C_DESTROY_BIO_PAIR,0,NULL)
-# define BIO_shutdown_wr(b) (int)BIO_ctrl(b, BIO_C_SHUTDOWN_WR, 0, NULL)
+#define BIO_set_write_buf_size(b, size) (int)BIO_ctrl(b, BIO_C_SET_WRITE_BUF_SIZE, size, NULL)
+#define BIO_get_write_buf_size(b, size) (size_t)BIO_ctrl(b, BIO_C_GET_WRITE_BUF_SIZE, size, NULL)
+#define BIO_make_bio_pair(b1, b2) (int)BIO_ctrl(b1, BIO_C_MAKE_BIO_PAIR, 0, b2)
+#define BIO_destroy_bio_pair(b) (int)BIO_ctrl(b, BIO_C_DESTROY_BIO_PAIR, 0, NULL)
+#define BIO_shutdown_wr(b) (int)BIO_ctrl(b, BIO_C_SHUTDOWN_WR, 0, NULL)
 /* macros with inappropriate type -- but ...pending macros use int too: */
-# define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL)
-# define BIO_get_read_request(b)    (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL)
+#define BIO_get_write_guarantee(b) (int)BIO_ctrl(b, BIO_C_GET_WRITE_GUARANTEE, 0, NULL)
+#define BIO_get_read_request(b) (int)BIO_ctrl(b, BIO_C_GET_READ_REQUEST, 0, NULL)
 size_t BIO_ctrl_get_write_guarantee(BIO *b);
 size_t BIO_ctrl_get_read_request(BIO *b);
 int BIO_ctrl_reset_read_request(BIO *b);
 
 /* ctrl macros for dgram */
-# define BIO_ctrl_dgram_connect(b,peer)  \
-                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)(peer))
-# define BIO_ctrl_set_connected(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, 0, (char *)(peer))
-# define BIO_dgram_recv_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
-# define BIO_dgram_send_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
-# define BIO_dgram_get_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)(peer))
-# define BIO_dgram_set_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)(peer))
-# define BIO_dgram_detect_peer_addr(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_DETECT_PEER_ADDR, 0, (char *)(peer))
-# define BIO_dgram_get_mtu_overhead(b) \
-         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU_OVERHEAD, 0, NULL)
-# define BIO_dgram_get_local_addr_cap(b) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_LOCAL_ADDR_CAP, 0, NULL)
-# define BIO_dgram_get_local_addr_enable(b, penable) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE, 0, (char *)(penable))
-# define BIO_dgram_set_local_addr_enable(b, enable) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_LOCAL_ADDR_ENABLE, (enable), NULL)
-# define BIO_dgram_get_effective_caps(b) \
-         (uint32_t)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS, 0, NULL)
-# define BIO_dgram_get_caps(b) \
-         (uint32_t)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_CAPS, 0, NULL)
-# define BIO_dgram_set_caps(b, caps) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_CAPS, (long)(caps), NULL)
-# define BIO_dgram_get_no_trunc(b) \
-         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_NO_TRUNC, 0, NULL)
-# define BIO_dgram_set_no_trunc(b, enable) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_NO_TRUNC, (enable), NULL)
-# define BIO_dgram_get_mtu(b) \
-         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU, 0, NULL)
-# define BIO_dgram_set_mtu(b, mtu) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_MTU, (mtu), NULL)
-# define BIO_dgram_set0_local_addr(b, addr) \
-         (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET0_LOCAL_ADDR, 0, (addr))
+#define BIO_ctrl_dgram_connect(b, peer) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_CONNECT, 0, (char *)(peer))
+#define BIO_ctrl_set_connected(b, peer) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, 0, (char *)(peer))
+#define BIO_dgram_recv_timedout(b) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
+#define BIO_dgram_send_timedout(b) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
+#define BIO_dgram_get_peer(b, peer) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)(peer))
+#define BIO_dgram_set_peer(b, peer) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)(peer))
+#define BIO_dgram_detect_peer_addr(b, peer) \
+    (int)BIO_ctrl(b, BIO_CTRL_DGRAM_DETECT_PEER_ADDR, 0, (char *)(peer))
+#define BIO_dgram_get_mtu_overhead(b) \
+    (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU_OVERHEAD, 0, NULL)
+#define BIO_dgram_get_local_addr_cap(b) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_LOCAL_ADDR_CAP, 0, NULL)
+#define BIO_dgram_get_local_addr_enable(b, penable) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_LOCAL_ADDR_ENABLE, 0, (char *)(penable))
+#define BIO_dgram_set_local_addr_enable(b, enable) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_LOCAL_ADDR_ENABLE, (enable), NULL)
+#define BIO_dgram_get_effective_caps(b) \
+    (uint32_t)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_EFFECTIVE_CAPS, 0, NULL)
+#define BIO_dgram_get_caps(b) \
+    (uint32_t)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_CAPS, 0, NULL)
+#define BIO_dgram_set_caps(b, caps) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_CAPS, (long)(caps), NULL)
+#define BIO_dgram_get_no_trunc(b) \
+    (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_NO_TRUNC, 0, NULL)
+#define BIO_dgram_set_no_trunc(b, enable) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_NO_TRUNC, (enable), NULL)
+#define BIO_dgram_get_mtu(b) \
+    (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU, 0, NULL)
+#define BIO_dgram_set_mtu(b, mtu) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET_MTU, (mtu), NULL)
+#define BIO_dgram_set0_local_addr(b, addr) \
+    (int)BIO_ctrl((b), BIO_CTRL_DGRAM_SET0_LOCAL_ADDR, 0, (addr))
 
 /* ctrl macros for BIO_f_prefix */
-# define BIO_set_prefix(b,p) BIO_ctrl((b), BIO_CTRL_SET_PREFIX, 0, (void *)(p))
-# define BIO_set_indent(b,i) BIO_ctrl((b), BIO_CTRL_SET_INDENT, (i), NULL)
-# define BIO_get_indent(b) BIO_ctrl((b), BIO_CTRL_GET_INDENT, 0, NULL)
+#define BIO_set_prefix(b, p) BIO_ctrl((b), BIO_CTRL_SET_PREFIX, 0, (void *)(p))
+#define BIO_set_indent(b, i) BIO_ctrl((b), BIO_CTRL_SET_INDENT, (i), NULL)
+#define BIO_get_indent(b) BIO_ctrl((b), BIO_CTRL_GET_INDENT, 0, NULL)
 
 #define BIO_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, l, p, newf, dupf, freef)
@@ -688,20 +691,20 @@ uint64_t BIO_number_written(BIO *bio);
 
 /* For BIO_f_asn1() */
 int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-                        asn1_ps_func *prefix_free);
+    asn1_ps_func *prefix_free);
 int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-                        asn1_ps_func **pprefix_free);
+    asn1_ps_func **pprefix_free);
 int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-                        asn1_ps_func *suffix_free);
+    asn1_ps_func *suffix_free);
 int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-                        asn1_ps_func **psuffix_free);
+    asn1_ps_func **psuffix_free);
 
 const BIO_METHOD *BIO_s_file(void);
 BIO *BIO_new_file(const char *filename, const char *mode);
 BIO *BIO_new_from_core_bio(OSSL_LIB_CTX *libctx, OSSL_CORE_BIO *corebio);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 BIO *BIO_new_fp(FILE *stream, int close_flag);
-# endif
+#endif
 BIO *BIO_new_ex(OSSL_LIB_CTX *libctx, const BIO_METHOD *method);
 BIO *BIO_new(const BIO_METHOD *type);
 int BIO_free(BIO *a);
@@ -716,15 +719,15 @@ int BIO_up_ref(BIO *a);
 int BIO_read(BIO *b, void *data, int dlen);
 int BIO_read_ex(BIO *b, void *data, size_t dlen, size_t *readbytes);
 __owur int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
-                        size_t stride, size_t num_msg, uint64_t flags,
-                        size_t *msgs_processed);
+    size_t stride, size_t num_msg, uint64_t flags,
+    size_t *msgs_processed);
 int BIO_gets(BIO *bp, char *buf, int size);
 int BIO_get_line(BIO *bio, char *buf, int size);
 int BIO_write(BIO *b, const void *data, int dlen);
 int BIO_write_ex(BIO *b, const void *data, size_t dlen, size_t *written);
 __owur int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
-                        size_t stride, size_t num_msg, uint64_t flags,
-                        size_t *msgs_processed);
+    size_t stride, size_t num_msg, uint64_t flags,
+    size_t *msgs_processed);
 __owur int BIO_get_rpoll_descriptor(BIO *b, BIO_POLL_DESCRIPTOR *desc);
 __owur int BIO_get_wpoll_descriptor(BIO *b, BIO_POLL_DESCRIPTOR *desc);
 int BIO_puts(BIO *bp, const char *buf);
@@ -750,16 +753,16 @@ int BIO_nwrite0(BIO *bio, char **buf);
 int BIO_nwrite(BIO *bio, char **buf, int num);
 
 const BIO_METHOD *BIO_s_mem(void);
-# ifndef OPENSSL_NO_DGRAM
+#ifndef OPENSSL_NO_DGRAM
 const BIO_METHOD *BIO_s_dgram_mem(void);
-# endif
+#endif
 const BIO_METHOD *BIO_s_secmem(void);
 BIO *BIO_new_mem_buf(const void *buf, int len);
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 const BIO_METHOD *BIO_s_socket(void);
 const BIO_METHOD *BIO_s_connect(void);
 const BIO_METHOD *BIO_s_accept(void);
-# endif
+#endif
 const BIO_METHOD *BIO_s_fd(void);
 const BIO_METHOD *BIO_s_log(void);
 const BIO_METHOD *BIO_s_bio(void);
@@ -771,53 +774,53 @@ const BIO_METHOD *BIO_f_linebuffer(void);
 const BIO_METHOD *BIO_f_nbio_test(void);
 const BIO_METHOD *BIO_f_prefix(void);
 const BIO_METHOD *BIO_s_core(void);
-# ifndef OPENSSL_NO_DGRAM
+#ifndef OPENSSL_NO_DGRAM
 const BIO_METHOD *BIO_s_dgram_pair(void);
 const BIO_METHOD *BIO_s_datagram(void);
 int BIO_dgram_non_fatal_error(int error);
 BIO *BIO_new_dgram(int fd, int close_flag);
-#  ifndef OPENSSL_NO_SCTP
+#ifndef OPENSSL_NO_SCTP
 const BIO_METHOD *BIO_s_datagram_sctp(void);
 BIO *BIO_new_dgram_sctp(int fd, int close_flag);
 int BIO_dgram_is_sctp(BIO *bio);
 int BIO_dgram_sctp_notification_cb(BIO *b,
-                BIO_dgram_sctp_notification_handler_fn handle_notifications,
-                void *context);
+    BIO_dgram_sctp_notification_handler_fn handle_notifications,
+    void *context);
 int BIO_dgram_sctp_wait_for_dry(BIO *b);
 int BIO_dgram_sctp_msg_waiting(BIO *b);
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 int BIO_sock_should_retry(int i);
 int BIO_sock_non_fatal_error(int error);
 int BIO_err_is_non_fatal(unsigned int errcode);
 int BIO_socket_wait(int fd, int for_read, time_t max_time);
-# endif
+#endif
 int BIO_wait(BIO *bio, time_t max_time, unsigned int nap_milliseconds);
 int BIO_do_connect_retry(BIO *bio, int timeout, int nap_milliseconds);
 
 int BIO_fd_should_retry(int i);
 int BIO_fd_non_fatal_error(int error);
-int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
-                void *u, const void *s, int len);
-int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
-                       void *u, const void *s, int len, int indent);
+int BIO_dump_cb(int (*cb)(const void *data, size_t len, void *u),
+    void *u, const void *s, int len);
+int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u),
+    void *u, const void *s, int len, int indent);
 int BIO_dump(BIO *b, const void *bytes, int len);
 int BIO_dump_indent(BIO *b, const void *bytes, int len, int indent);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int BIO_dump_fp(FILE *fp, const void *s, int len);
 int BIO_dump_indent_fp(FILE *fp, const void *s, int len, int indent);
-# endif
+#endif
 int BIO_hex_string(BIO *out, int indent, int width, const void *data,
-                   int datalen);
+    int datalen);
 
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 BIO_ADDR *BIO_ADDR_new(void);
 int BIO_ADDR_copy(BIO_ADDR *dst, const BIO_ADDR *src);
 BIO_ADDR *BIO_ADDR_dup(const BIO_ADDR *ap);
 int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,
-                     const void *where, size_t wherelen, unsigned short port);
+    const void *where, size_t wherelen, unsigned short port);
 void BIO_ADDR_free(BIO_ADDR *);
 void BIO_ADDR_clear(BIO_ADDR *ap);
 int BIO_ADDR_family(const BIO_ADDR *ap);
@@ -835,34 +838,38 @@ const BIO_ADDR *BIO_ADDRINFO_address(const BIO_ADDRINFO *bai);
 void BIO_ADDRINFO_free(BIO_ADDRINFO *bai);
 
 enum BIO_hostserv_priorities {
-    BIO_PARSE_PRIO_HOST, BIO_PARSE_PRIO_SERV
+    BIO_PARSE_PRIO_HOST,
+    BIO_PARSE_PRIO_SERV
 };
 int BIO_parse_hostserv(const char *hostserv, char **host, char **service,
-                       enum BIO_hostserv_priorities hostserv_prio);
+    enum BIO_hostserv_priorities hostserv_prio);
 enum BIO_lookup_type {
-    BIO_LOOKUP_CLIENT, BIO_LOOKUP_SERVER
+    BIO_LOOKUP_CLIENT,
+    BIO_LOOKUP_SERVER
 };
 int BIO_lookup(const char *host, const char *service,
-               enum BIO_lookup_type lookup_type,
-               int family, int socktype, BIO_ADDRINFO **res);
+    enum BIO_lookup_type lookup_type,
+    int family, int socktype, BIO_ADDRINFO **res);
 int BIO_lookup_ex(const char *host, const char *service,
-                  int lookup_type, int family, int socktype, int protocol,
-                  BIO_ADDRINFO **res);
+    int lookup_type, int family, int socktype, int protocol,
+    BIO_ADDRINFO **res);
 int BIO_sock_error(int sock);
 int BIO_socket_ioctl(int fd, long type, void *arg);
 int BIO_socket_nbio(int fd, int mode);
 int BIO_sock_init(void);
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define BIO_sock_cleanup() while(0) continue
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define BIO_sock_cleanup() \
+    while (0)              \
+    continue
+#endif
 int BIO_set_tcp_ndelay(int sock, int turn_on);
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 struct hostent *BIO_gethostbyname(const char *name);
 OSSL_DEPRECATEDIN_1_1_0 int BIO_get_port(const char *str, unsigned short *port_ptr);
 OSSL_DEPRECATEDIN_1_1_0 int BIO_get_host_ip(const char *str, unsigned char *ip);
 OSSL_DEPRECATEDIN_1_1_0 int BIO_get_accept_socket(char *host_port, int mode);
 OSSL_DEPRECATEDIN_1_1_0 int BIO_accept(int sock, char **ip_port);
-# endif
+#endif
 
 union BIO_sock_info_u {
     BIO_ADDR *addr;
@@ -871,14 +878,14 @@ enum BIO_sock_info_type {
     BIO_SOCK_INFO_ADDRESS
 };
 int BIO_sock_info(int sock,
-                  enum BIO_sock_info_type type, union BIO_sock_info_u *info);
+    enum BIO_sock_info_type type, union BIO_sock_info_u *info);
 
-#  define BIO_SOCK_REUSEADDR    0x01
-#  define BIO_SOCK_V6_ONLY      0x02
-#  define BIO_SOCK_KEEPALIVE    0x04
-#  define BIO_SOCK_NONBLOCK     0x08
-#  define BIO_SOCK_NODELAY      0x10
-#  define BIO_SOCK_TFO          0x20
+#define BIO_SOCK_REUSEADDR 0x01
+#define BIO_SOCK_V6_ONLY 0x02
+#define BIO_SOCK_KEEPALIVE 0x04
+#define BIO_SOCK_NONBLOCK 0x08
+#define BIO_SOCK_NODELAY 0x10
+#define BIO_SOCK_TFO 0x20
 
 int BIO_socket(int domain, int socktype, int protocol, int options);
 int BIO_connect(int sock, const BIO_ADDR *addr, int options);
@@ -890,16 +897,16 @@ int BIO_closesocket(int sock);
 BIO *BIO_new_socket(int sock, int close_flag);
 BIO *BIO_new_connect(const char *host_port);
 BIO *BIO_new_accept(const char *host_port);
-# endif /* OPENSSL_NO_SOCK*/
+#endif /* OPENSSL_NO_SOCK*/
 
 BIO *BIO_new_fd(int fd, int close_flag);
 
 int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-                     BIO **bio2, size_t writebuf2);
-# ifndef OPENSSL_NO_DGRAM
+    BIO **bio2, size_t writebuf2);
+#ifndef OPENSSL_NO_DGRAM
 int BIO_new_bio_dgram_pair(BIO **bio1, size_t writebuf1,
-                           BIO **bio2, size_t writebuf2);
-# endif
+    BIO **bio2, size_t writebuf2);
+#endif
 
 /*
  * If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
@@ -913,87 +920,86 @@ void BIO_copy_next_retry(BIO *b);
  * long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
  */
 
-# define ossl_bio__attr__(x)
-# if defined(__GNUC__) && defined(__STDC_VERSION__) \
+#define ossl_bio__attr__(x)
+#if defined(__GNUC__) && defined(__STDC_VERSION__)    \
     && !defined(__MINGW32__) && !defined(__MINGW64__) \
     && !defined(__APPLE__)
-    /*
-     * Because we support the 'z' modifier, which made its appearance in C99,
-     * we can't use __attribute__ with pre C99 dialects.
-     */
-#  if __STDC_VERSION__ >= 199901L
-#   undef ossl_bio__attr__
-#   define ossl_bio__attr__ __attribute__
-#   if __GNUC__*10 + __GNUC_MINOR__ >= 44
-#    define ossl_bio__printf__ __gnu_printf__
-#   else
-#    define ossl_bio__printf__ __printf__
-#   endif
-#  endif
-# endif
+/*
+ * Because we support the 'z' modifier, which made its appearance in C99,
+ * we can't use __attribute__ with pre C99 dialects.
+ */
+#if __STDC_VERSION__ >= 199901L
+#undef ossl_bio__attr__
+#define ossl_bio__attr__ __attribute__
+#if __GNUC__ * 10 + __GNUC_MINOR__ >= 44
+#define ossl_bio__printf__ __gnu_printf__
+#else
+#define ossl_bio__printf__ __printf__
+#endif
+#endif
+#endif
 int BIO_printf(BIO *bio, const char *format, ...)
-ossl_bio__attr__((__format__(ossl_bio__printf__, 2, 3)));
+    ossl_bio__attr__((__format__(ossl_bio__printf__, 2, 3)));
 int BIO_vprintf(BIO *bio, const char *format, va_list args)
-ossl_bio__attr__((__format__(ossl_bio__printf__, 2, 0)));
+    ossl_bio__attr__((__format__(ossl_bio__printf__, 2, 0)));
 int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-ossl_bio__attr__((__format__(ossl_bio__printf__, 3, 4)));
+    ossl_bio__attr__((__format__(ossl_bio__printf__, 3, 4)));
 int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-ossl_bio__attr__((__format__(ossl_bio__printf__, 3, 0)));
-# undef ossl_bio__attr__
-# undef ossl_bio__printf__
-
+    ossl_bio__attr__((__format__(ossl_bio__printf__, 3, 0)));
+#undef ossl_bio__attr__
+#undef ossl_bio__printf__
 
 BIO_METHOD *BIO_meth_new(int type, const char *name);
 void BIO_meth_free(BIO_METHOD *biom);
 int BIO_meth_set_write(BIO_METHOD *biom,
-                       int (*write) (BIO *, const char *, int));
+    int (*write)(BIO *, const char *, int));
 int BIO_meth_set_write_ex(BIO_METHOD *biom,
-                       int (*bwrite) (BIO *, const char *, size_t, size_t *));
+    int (*bwrite)(BIO *, const char *, size_t, size_t *));
 int BIO_meth_set_sendmmsg(BIO_METHOD *biom,
-                          int (*f) (BIO *, BIO_MSG *, size_t, size_t,
-                                    uint64_t, size_t *));
+    int (*f)(BIO *, BIO_MSG *, size_t, size_t,
+        uint64_t, size_t *));
 int BIO_meth_set_read(BIO_METHOD *biom,
-                      int (*read) (BIO *, char *, int));
+    int (*read)(BIO *, char *, int));
 int BIO_meth_set_read_ex(BIO_METHOD *biom,
-                         int (*bread) (BIO *, char *, size_t, size_t *));
+    int (*bread)(BIO *, char *, size_t, size_t *));
 int BIO_meth_set_recvmmsg(BIO_METHOD *biom,
-                          int (*f) (BIO *, BIO_MSG *, size_t, size_t,
-                                    uint64_t, size_t *));
+    int (*f)(BIO *, BIO_MSG *, size_t, size_t,
+        uint64_t, size_t *));
 int BIO_meth_set_puts(BIO_METHOD *biom,
-                      int (*puts) (BIO *, const char *));
+    int (*puts)(BIO *, const char *));
 int BIO_meth_set_gets(BIO_METHOD *biom,
-                      int (*ossl_gets) (BIO *, char *, int));
+    int (*ossl_gets)(BIO *, char *, int));
 int BIO_meth_set_ctrl(BIO_METHOD *biom,
-                      long (*ctrl) (BIO *, int, long, void *));
-int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *));
-int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *));
+    long (*ctrl)(BIO *, int, long, void *));
+int BIO_meth_set_create(BIO_METHOD *biom, int (*create)(BIO *));
+int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy)(BIO *));
 int BIO_meth_set_callback_ctrl(BIO_METHOD *biom,
-                               long (*callback_ctrl) (BIO *, int,
-                                                      BIO_info_cb *));
-# ifndef OPENSSL_NO_DEPRECATED_3_5
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_write(const BIO_METHOD *biom)) (BIO *, const char *,
-                                                                         int);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_write_ex(const BIO_METHOD *biom)) (BIO *, const char *,
-                                                                            size_t, size_t *);
+    long (*callback_ctrl)(BIO *, int,
+        BIO_info_cb *));
+#ifndef OPENSSL_NO_DEPRECATED_3_5
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_write(const BIO_METHOD *biom))(BIO *, const char *,
+    int);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_write_ex(const BIO_METHOD *biom))(BIO *, const char *,
+    size_t, size_t *);
 OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_sendmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *,
-                                                                           size_t, size_t,
-                                                                           uint64_t, size_t *);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_read(const BIO_METHOD *biom)) (BIO *, char *, int);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_read_ex(const BIO_METHOD *biom)) (BIO *, char *,
-                                                                           size_t, size_t *);
+    size_t, size_t,
+    uint64_t, size_t *);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_read(const BIO_METHOD *biom))(BIO *, char *, int);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_read_ex(const BIO_METHOD *biom))(BIO *, char *,
+    size_t, size_t *);
 OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_recvmmsg(const BIO_METHOD *biom))(BIO *, BIO_MSG *,
-                                                                           size_t, size_t,
-                                                                           uint64_t, size_t *);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_puts(const BIO_METHOD *biom)) (BIO *, const char *);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_gets(const BIO_METHOD *biom)) (BIO *, char *, int);
-OSSL_DEPRECATEDIN_3_5 long (*BIO_meth_get_ctrl(const BIO_METHOD *biom)) (BIO *, int,
-                                                                         long, void *);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_create(const BIO_METHOD *bion)) (BIO *);
-OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_destroy(const BIO_METHOD *biom)) (BIO *);
-OSSL_DEPRECATEDIN_3_5 long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom)) (BIO *, int,
-                                                                                  BIO_info_cb *);
-# endif
-# ifdef  __cplusplus
+    size_t, size_t,
+    uint64_t, size_t *);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_puts(const BIO_METHOD *biom))(BIO *, const char *);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_gets(const BIO_METHOD *biom))(BIO *, char *, int);
+OSSL_DEPRECATEDIN_3_5 long (*BIO_meth_get_ctrl(const BIO_METHOD *biom))(BIO *, int,
+    long, void *);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_create(const BIO_METHOD *bion))(BIO *);
+OSSL_DEPRECATEDIN_3_5 int (*BIO_meth_get_destroy(const BIO_METHOD *biom))(BIO *);
+OSSL_DEPRECATEDIN_3_5 long (*BIO_meth_get_callback_ctrl(const BIO_METHOD *biom))(BIO *, int,
+    BIO_info_cb *);
+#endif
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h
index e4fdb64974fc..b4ee5c68beec 100644
--- a/include/openssl/bioerr.h
+++ b/include/openssl/bioerr.h
@@ -9,64 +9,62 @@
  */
 
 #ifndef OPENSSL_BIOERR_H
-# define OPENSSL_BIOERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_BIOERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * BIO reason codes.
  */
-# define BIO_R_ACCEPT_ERROR                               100
-# define BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET               141
-# define BIO_R_AMBIGUOUS_HOST_OR_SERVICE                  129
-# define BIO_R_BAD_FOPEN_MODE                             101
-# define BIO_R_BROKEN_PIPE                                124
-# define BIO_R_CONNECT_ERROR                              103
-# define BIO_R_CONNECT_TIMEOUT                            147
-# define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET          107
-# define BIO_R_GETSOCKNAME_ERROR                          132
-# define BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS              133
-# define BIO_R_GETTING_SOCKTYPE                           134
-# define BIO_R_INVALID_ARGUMENT                           125
-# define BIO_R_INVALID_SOCKET                             135
-# define BIO_R_IN_USE                                     123
-# define BIO_R_LENGTH_TOO_LONG                            102
-# define BIO_R_LISTEN_V6_ONLY                             136
-# define BIO_R_LOCAL_ADDR_NOT_AVAILABLE                   111
-# define BIO_R_LOOKUP_RETURNED_NOTHING                    142
-# define BIO_R_MALFORMED_HOST_OR_SERVICE                  130
-# define BIO_R_NBIO_CONNECT_ERROR                         110
-# define BIO_R_NON_FATAL                                  112
-# define BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED        143
-# define BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED           144
-# define BIO_R_NO_PORT_DEFINED                            113
-# define BIO_R_NO_SUCH_FILE                               128
-# define BIO_R_NULL_PARAMETER                             115 /* unused */
-# define BIO_R_TFO_DISABLED                               106
-# define BIO_R_TFO_NO_KERNEL_SUPPORT                      108
-# define BIO_R_TRANSFER_ERROR                             104
-# define BIO_R_TRANSFER_TIMEOUT                           105
-# define BIO_R_UNABLE_TO_BIND_SOCKET                      117
-# define BIO_R_UNABLE_TO_CREATE_SOCKET                    118
-# define BIO_R_UNABLE_TO_KEEPALIVE                        137
-# define BIO_R_UNABLE_TO_LISTEN_SOCKET                    119
-# define BIO_R_UNABLE_TO_NODELAY                          138
-# define BIO_R_UNABLE_TO_REUSEADDR                        139
-# define BIO_R_UNABLE_TO_TFO                              109
-# define BIO_R_UNAVAILABLE_IP_FAMILY                      145
-# define BIO_R_UNINITIALIZED                              120
-# define BIO_R_UNKNOWN_INFO_TYPE                          140
-# define BIO_R_UNSUPPORTED_IP_FAMILY                      146
-# define BIO_R_UNSUPPORTED_METHOD                         121
-# define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY                131
-# define BIO_R_WRITE_TO_READ_ONLY_BIO                     126
-# define BIO_R_WSASTARTUP                                 122
-# define BIO_R_PORT_MISMATCH                              150
-# define BIO_R_PEER_ADDR_NOT_AVAILABLE                    151
+#define BIO_R_ACCEPT_ERROR 100
+#define BIO_R_ADDRINFO_ADDR_IS_NOT_AF_INET 141
+#define BIO_R_AMBIGUOUS_HOST_OR_SERVICE 129
+#define BIO_R_BAD_FOPEN_MODE 101
+#define BIO_R_BROKEN_PIPE 124
+#define BIO_R_CONNECT_ERROR 103
+#define BIO_R_CONNECT_TIMEOUT 147
+#define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET 107
+#define BIO_R_GETSOCKNAME_ERROR 132
+#define BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS 133
+#define BIO_R_GETTING_SOCKTYPE 134
+#define BIO_R_INVALID_ARGUMENT 125
+#define BIO_R_INVALID_SOCKET 135
+#define BIO_R_IN_USE 123
+#define BIO_R_LENGTH_TOO_LONG 102
+#define BIO_R_LISTEN_V6_ONLY 136
+#define BIO_R_LOCAL_ADDR_NOT_AVAILABLE 111
+#define BIO_R_LOOKUP_RETURNED_NOTHING 142
+#define BIO_R_MALFORMED_HOST_OR_SERVICE 130
+#define BIO_R_NBIO_CONNECT_ERROR 110
+#define BIO_R_NON_FATAL 112
+#define BIO_R_NO_ACCEPT_ADDR_OR_SERVICE_SPECIFIED 143
+#define BIO_R_NO_HOSTNAME_OR_SERVICE_SPECIFIED 144
+#define BIO_R_NO_PORT_DEFINED 113
+#define BIO_R_NO_SUCH_FILE 128
+#define BIO_R_NULL_PARAMETER 115 /* unused */
+#define BIO_R_TFO_DISABLED 106
+#define BIO_R_TFO_NO_KERNEL_SUPPORT 108
+#define BIO_R_TRANSFER_ERROR 104
+#define BIO_R_TRANSFER_TIMEOUT 105
+#define BIO_R_UNABLE_TO_BIND_SOCKET 117
+#define BIO_R_UNABLE_TO_CREATE_SOCKET 118
+#define BIO_R_UNABLE_TO_KEEPALIVE 137
+#define BIO_R_UNABLE_TO_LISTEN_SOCKET 119
+#define BIO_R_UNABLE_TO_NODELAY 138
+#define BIO_R_UNABLE_TO_REUSEADDR 139
+#define BIO_R_UNABLE_TO_TFO 109
+#define BIO_R_UNAVAILABLE_IP_FAMILY 145
+#define BIO_R_UNINITIALIZED 120
+#define BIO_R_UNKNOWN_INFO_TYPE 140
+#define BIO_R_UNSUPPORTED_IP_FAMILY 146
+#define BIO_R_UNSUPPORTED_METHOD 121
+#define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY 131
+#define BIO_R_WRITE_TO_READ_ONLY_BIO 126
+#define BIO_R_WSASTARTUP 122
+#define BIO_R_PORT_MISMATCH 150
+#define BIO_R_PEER_ADDR_NOT_AVAILABLE 151
 
 #endif
diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h
index 667d6423912b..49c74e946ce7 100644
--- a/include/openssl/blowfish.h
+++ b/include/openssl/blowfish.h
@@ -8,71 +8,71 @@
  */
 
 #ifndef OPENSSL_BLOWFISH_H
-# define OPENSSL_BLOWFISH_H
-# pragma once
+#define OPENSSL_BLOWFISH_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BLOWFISH_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_BLOWFISH_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_BF
-# include <openssl/e_os2.h>
-# ifdef  __cplusplus
+#ifndef OPENSSL_NO_BF
+#include <openssl/e_os2.h>
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# define BF_BLOCK        8
+#define BF_BLOCK 8
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
-#  define BF_ENCRYPT      1
-#  define BF_DECRYPT      0
+#define BF_ENCRYPT 1
+#define BF_DECRYPT 0
 
 /*-
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * ! BF_LONG has to be at least 32 bits wide.                     !
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
-#  define BF_LONG unsigned int
+#define BF_LONG unsigned int
 
-#  define BF_ROUNDS       16
+#define BF_ROUNDS 16
 
 typedef struct bf_key_st {
     BF_LONG P[BF_ROUNDS + 2];
     BF_LONG S[4 * 256];
 } BF_KEY;
 
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 void BF_set_key(BF_KEY *key, int len,
-                                      const unsigned char *data);
+    const unsigned char *data);
 OSSL_DEPRECATEDIN_3_0 void BF_encrypt(BF_LONG *data, const BF_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void BF_decrypt(BF_LONG *data, const BF_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void BF_ecb_encrypt(const unsigned char *in,
-                                          unsigned char *out, const BF_KEY *key,
-                                          int enc);
+    unsigned char *out, const BF_KEY *key,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void BF_cbc_encrypt(const unsigned char *in,
-                                          unsigned char *out, long length,
-                                          const BF_KEY *schedule,
-                                          unsigned char *ivec, int enc);
+    unsigned char *out, long length,
+    const BF_KEY *schedule,
+    unsigned char *ivec, int enc);
 OSSL_DEPRECATEDIN_3_0 void BF_cfb64_encrypt(const unsigned char *in,
-                                            unsigned char *out,
-                                            long length, const BF_KEY *schedule,
-                                            unsigned char *ivec, int *num,
-                                            int enc);
+    unsigned char *out,
+    long length, const BF_KEY *schedule,
+    unsigned char *ivec, int *num,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void BF_ofb64_encrypt(const unsigned char *in,
-                                            unsigned char *out,
-                                            long length, const BF_KEY *schedule,
-                                            unsigned char *ivec, int *num);
+    unsigned char *out,
+    long length, const BF_KEY *schedule,
+    unsigned char *ivec, int *num);
 OSSL_DEPRECATEDIN_3_0 const char *BF_options(void);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index ea706dca7f2f..d210b8bddd51 100644
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -9,54 +9,54 @@
  */
 
 #ifndef OPENSSL_BN_H
-# define OPENSSL_BN_H
-# pragma once
+#define OPENSSL_BN_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BN_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_BN_H
+#endif
 
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <openssl/opensslconf.h>
-# include <openssl/types.h>
-# include <openssl/crypto.h>
-# include <openssl/bnerr.h>
+#include <openssl/e_os2.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#include <openssl/opensslconf.h>
+#include <openssl/types.h>
+#include <openssl/crypto.h>
+#include <openssl/bnerr.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /*
  * 64-bit processor with LP64 ABI
  */
-# ifdef SIXTY_FOUR_BIT_LONG
-#  define BN_ULONG        unsigned long
-#  define BN_BYTES        8
-# endif
+#ifdef SIXTY_FOUR_BIT_LONG
+#define BN_ULONG unsigned long
+#define BN_BYTES 8
+#endif
 
 /*
  * 64-bit processor other than LP64 ABI
  */
-# ifdef SIXTY_FOUR_BIT
-#  define BN_ULONG        unsigned long long
-#  define BN_BYTES        8
-# endif
+#ifdef SIXTY_FOUR_BIT
+#define BN_ULONG unsigned long long
+#define BN_BYTES 8
+#endif
 
-# ifdef THIRTY_TWO_BIT
-#  define BN_ULONG        unsigned int
-#  define BN_BYTES        4
-# endif
+#ifdef THIRTY_TWO_BIT
+#define BN_ULONG unsigned int
+#define BN_BYTES 4
+#endif
 
-# define BN_BITS2       (BN_BYTES * 8)
-# define BN_BITS        (BN_BITS2 * 2)
-# define BN_TBIT        ((BN_ULONG)1 << (BN_BITS2 - 1))
+#define BN_BITS2 (BN_BYTES * 8)
+#define BN_BITS (BN_BITS2 * 2)
+#define BN_TBIT ((BN_ULONG)1 << (BN_BITS2 - 1))
 
-# define BN_FLG_MALLOCED         0x01
-# define BN_FLG_STATIC_DATA      0x02
+#define BN_FLG_MALLOCED 0x01
+#define BN_FLG_STATIC_DATA 0x02
 
 /*
  * avoid leaking exponent information through timing,
@@ -64,26 +64,26 @@ extern "C" {
  * BN_div() will call BN_div_no_branch,
  * BN_mod_inverse() will call bn_mod_inverse_no_branch.
  */
-# define BN_FLG_CONSTTIME        0x04
-# define BN_FLG_SECURE           0x08
+#define BN_FLG_CONSTTIME 0x04
+#define BN_FLG_SECURE 0x08
 
-# ifndef OPENSSL_NO_DEPRECATED_0_9_8
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
 /* deprecated name for the flag */
-#  define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME
-#  define BN_FLG_FREE            0x8000 /* used for debugging */
-# endif
+#define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME
+#define BN_FLG_FREE 0x8000 /* used for debugging */
+#endif
 
 void BN_set_flags(BIGNUM *b, int n);
 int BN_get_flags(const BIGNUM *b, int n);
 
 /* Values for |top| in BN_rand() */
-#define BN_RAND_TOP_ANY    -1
-#define BN_RAND_TOP_ONE     0
-#define BN_RAND_TOP_TWO     1
+#define BN_RAND_TOP_ANY -1
+#define BN_RAND_TOP_ONE 0
+#define BN_RAND_TOP_TWO 1
 
 /* Values for |bottom| in BN_rand() */
-#define BN_RAND_BOTTOM_ANY  0
-#define BN_RAND_BOTTOM_ODD  1
+#define BN_RAND_BOTTOM_ANY 0
+#define BN_RAND_BOTTOM_ODD 1
 
 /*
  * get a clone of a BIGNUM with changed flags, for *temporary* use only (the
@@ -100,18 +100,18 @@ BN_GENCB *BN_GENCB_new(void);
 void BN_GENCB_free(BN_GENCB *cb);
 
 /* Populate a BN_GENCB structure with an "old"-style callback */
-void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback) (int, int, void *),
-                      void *cb_arg);
+void BN_GENCB_set_old(BN_GENCB *gencb, void (*callback)(int, int, void *),
+    void *cb_arg);
 
 /* Populate a BN_GENCB structure with a "new"-style callback */
-void BN_GENCB_set(BN_GENCB *gencb, int (*callback) (int, int, BN_GENCB *),
-                  void *cb_arg);
+void BN_GENCB_set(BN_GENCB *gencb, int (*callback)(int, int, BN_GENCB *),
+    void *cb_arg);
 
 void *BN_GENCB_get_arg(BN_GENCB *cb);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define BN_prime_checks 0      /* default: select number of iterations based
-                                  * on the size of the number */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define BN_prime_checks 0 /* default: select number of iterations based \
+                           * on the size of the number */
 
 /*
  * BN_prime_checks_for_size() returns the number of Miller-Rabin iterations
@@ -176,17 +176,16 @@ void *BN_GENCB_get_arg(BN_GENCB *cb);
  *  (b) >=    6 |     >=    12 |         34 |         64 bit
  */
 
-#  define BN_prime_checks_for_size(b) ((b) >= 3747 ?  3 : \
-                                      (b) >=  1345 ?  4 : \
-                                      (b) >=  476 ?  5 : \
-                                      (b) >=  400 ?  6 : \
-                                      (b) >=  347 ?  7 : \
-                                      (b) >=  308 ?  8 : \
-                                      (b) >=  55  ? 27 : \
-                                      /* b >= 6 */ 34)
-# endif
+#define BN_prime_checks_for_size(b) ((b) >= 3747 ? 3 : (b) >= 1345 ? 4  \
+        : (b) >= 476                                               ? 5  \
+        : (b) >= 400                                               ? 6  \
+        : (b) >= 347                                               ? 7  \
+        : (b) >= 308                                               ? 8  \
+        : (b) >= 55                                                ? 27 \
+                                                                   : /* b >= 6 */ 34)
+#endif
 
-# define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
+#define BN_num_bytes(a) ((BN_num_bits(a) + 7) / 8)
 
 int BN_abs_is_word(const BIGNUM *a, const BN_ULONG w);
 int BN_is_zero(const BIGNUM *a);
@@ -194,15 +193,15 @@ int BN_is_one(const BIGNUM *a);
 int BN_is_word(const BIGNUM *a, const BN_ULONG w);
 int BN_is_odd(const BIGNUM *a);
 
-# define BN_one(a)       (BN_set_word((a),1))
+#define BN_one(a) (BN_set_word((a), 1))
 
 void BN_zero_ex(BIGNUM *a);
 
-# if OPENSSL_API_LEVEL > 908
-#  define BN_zero(a)      BN_zero_ex(a)
-# else
-#  define BN_zero(a)      (BN_set_word((a),0))
-# endif
+#if OPENSSL_API_LEVEL > 908
+#define BN_zero(a) BN_zero_ex(a)
+#else
+#define BN_zero(a) (BN_set_word((a), 0))
+#endif
 
 const BIGNUM *BN_value_one(void);
 char *BN_options(void);
@@ -215,23 +214,23 @@ void BN_CTX_start(BN_CTX *ctx);
 BIGNUM *BN_CTX_get(BN_CTX *ctx);
 void BN_CTX_end(BN_CTX *ctx);
 int BN_rand_ex(BIGNUM *rnd, int bits, int top, int bottom,
-               unsigned int strength, BN_CTX *ctx);
+    unsigned int strength, BN_CTX *ctx);
 int BN_rand(BIGNUM *rnd, int bits, int top, int bottom);
 int BN_priv_rand_ex(BIGNUM *rnd, int bits, int top, int bottom,
-                    unsigned int strength, BN_CTX *ctx);
+    unsigned int strength, BN_CTX *ctx);
 int BN_priv_rand(BIGNUM *rnd, int bits, int top, int bottom);
 int BN_rand_range_ex(BIGNUM *r, const BIGNUM *range, unsigned int strength,
-                     BN_CTX *ctx);
+    BN_CTX *ctx);
 int BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
 int BN_priv_rand_range_ex(BIGNUM *r, const BIGNUM *range,
-                          unsigned int strength, BN_CTX *ctx);
+    unsigned int strength, BN_CTX *ctx);
 int BN_priv_rand_range(BIGNUM *rnd, const BIGNUM *range);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom);
 OSSL_DEPRECATEDIN_3_0
 int BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range);
-# endif
+#endif
 int BN_num_bits(const BIGNUM *a);
 int BN_num_bits_word(BN_ULONG l);
 int BN_security_bits(int L, int N);
@@ -273,24 +272,24 @@ void BN_set_negative(BIGNUM *b, int n);
 int BN_is_negative(const BIGNUM *b);
 
 int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-           BN_CTX *ctx);
-# define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
+    BN_CTX *ctx);
+#define BN_mod(rem, m, d, ctx) BN_div(NULL, (rem), (m), (d), (ctx))
 int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
 int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
+    BN_CTX *ctx);
 int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
+    const BIGNUM *m);
 int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
+    BN_CTX *ctx);
 int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
+    const BIGNUM *m);
 int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
+    BN_CTX *ctx);
 int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
 int BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
 int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m);
 int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m,
-                  BN_CTX *ctx);
+    BN_CTX *ctx);
 int BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m);
 
 BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
@@ -309,29 +308,29 @@ int BN_lshift1(BIGNUM *r, const BIGNUM *a);
 int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
 
 int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-               const BIGNUM *m, BN_CTX *ctx);
+    const BIGNUM *m, BN_CTX *ctx);
 int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
-                              const BIGNUM *m, BN_CTX *ctx,
-                              BN_MONT_CTX *in_mont);
+    const BIGNUM *m, BN_CTX *ctx,
+    BN_MONT_CTX *in_mont);
 int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
-                         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
-                     const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
-                     BN_CTX *ctx, BN_MONT_CTX *m_ctx);
+    const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
+    BN_CTX *ctx, BN_MONT_CTX *m_ctx);
 int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                      const BIGNUM *m, BN_CTX *ctx);
+    const BIGNUM *m, BN_CTX *ctx);
 int BN_mod_exp_mont_consttime_x2(BIGNUM *rr1, const BIGNUM *a1, const BIGNUM *p1,
-                                 const BIGNUM *m1, BN_MONT_CTX *in_mont1,
-                                 BIGNUM *rr2, const BIGNUM *a2, const BIGNUM *p2,
-                                 const BIGNUM *m2, BN_MONT_CTX *in_mont2,
-                                 BN_CTX *ctx);
+    const BIGNUM *m1, BN_MONT_CTX *in_mont1,
+    BIGNUM *rr2, const BIGNUM *a2, const BIGNUM *p2,
+    const BIGNUM *m2, BN_MONT_CTX *in_mont2,
+    BN_CTX *ctx);
 
 int BN_mask_bits(BIGNUM *a, int n);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int BN_print_fp(FILE *fp, const BIGNUM *a);
-# endif
+#endif
 int BN_print(BIO *bio, const BIGNUM *a);
 int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx);
 int BN_rshift(BIGNUM *r, const BIGNUM *a, int n);
@@ -352,75 +351,75 @@ int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); /* returns
                                                                   * error */
 int BN_are_coprime(BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
 BIGNUM *BN_mod_inverse(BIGNUM *ret,
-                       const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
+    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
 BIGNUM *BN_mod_sqrt(BIGNUM *ret,
-                    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
+    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
 
 void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
 
 /* Deprecated versions */
-# ifndef OPENSSL_NO_DEPRECATED_0_9_8
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
 OSSL_DEPRECATEDIN_0_9_8
 BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
-                          const BIGNUM *add, const BIGNUM *rem,
-                          void (*callback) (int, int, void *),
-                          void *cb_arg);
+    const BIGNUM *add, const BIGNUM *rem,
+    void (*callback)(int, int, void *),
+    void *cb_arg);
 OSSL_DEPRECATEDIN_0_9_8
 int BN_is_prime(const BIGNUM *p, int nchecks,
-                void (*callback) (int, int, void *),
-                BN_CTX *ctx, void *cb_arg);
+    void (*callback)(int, int, void *),
+    BN_CTX *ctx, void *cb_arg);
 OSSL_DEPRECATEDIN_0_9_8
 int BN_is_prime_fasttest(const BIGNUM *p, int nchecks,
-                         void (*callback) (int, int, void *),
-                         BN_CTX *ctx, void *cb_arg,
-                         int do_trial_division);
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    void (*callback)(int, int, void *),
+    BN_CTX *ctx, void *cb_arg,
+    int do_trial_division);
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, BN_GENCB *cb);
 OSSL_DEPRECATEDIN_3_0
 int BN_is_prime_fasttest_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx,
-                            int do_trial_division, BN_GENCB *cb);
-# endif
+    int do_trial_division, BN_GENCB *cb);
+#endif
 /* Newer versions */
 int BN_generate_prime_ex2(BIGNUM *ret, int bits, int safe,
-                          const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb,
-                          BN_CTX *ctx);
+    const BIGNUM *add, const BIGNUM *rem, BN_GENCB *cb,
+    BN_CTX *ctx);
 int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
-                         const BIGNUM *rem, BN_GENCB *cb);
+    const BIGNUM *rem, BN_GENCB *cb);
 int BN_check_prime(const BIGNUM *p, BN_CTX *ctx, BN_GENCB *cb);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
 
 OSSL_DEPRECATEDIN_3_0
 int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
-                            const BIGNUM *Xp, const BIGNUM *Xp1,
-                            const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
-                            BN_GENCB *cb);
+    const BIGNUM *Xp, const BIGNUM *Xp1,
+    const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
+    BN_GENCB *cb);
 OSSL_DEPRECATEDIN_3_0
 int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, BIGNUM *Xp1,
-                              BIGNUM *Xp2, const BIGNUM *Xp, const BIGNUM *e,
-                              BN_CTX *ctx, BN_GENCB *cb);
-# endif
+    BIGNUM *Xp2, const BIGNUM *Xp, const BIGNUM *e,
+    BN_CTX *ctx, BN_GENCB *cb);
+#endif
 
 BN_MONT_CTX *BN_MONT_CTX_new(void);
 int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                          BN_MONT_CTX *mont, BN_CTX *ctx);
+    BN_MONT_CTX *mont, BN_CTX *ctx);
 int BN_to_montgomery(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                     BN_CTX *ctx);
+    BN_CTX *ctx);
 int BN_from_montgomery(BIGNUM *r, const BIGNUM *a, BN_MONT_CTX *mont,
-                       BN_CTX *ctx);
+    BN_CTX *ctx);
 void BN_MONT_CTX_free(BN_MONT_CTX *mont);
 int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx);
 BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from);
 BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, CRYPTO_RWLOCK *lock,
-                                    const BIGNUM *mod, BN_CTX *ctx);
+    const BIGNUM *mod, BN_CTX *ctx);
 
 /* BN_BLINDING flags */
-# define BN_BLINDING_NO_UPDATE   0x00000001
-# define BN_BLINDING_NO_RECREATE 0x00000002
+#define BN_BLINDING_NO_UPDATE 0x00000001
+#define BN_BLINDING_NO_RECREATE 0x00000002
 
 BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod);
 void BN_BLINDING_free(BN_BLINDING *b);
@@ -429,7 +428,7 @@ int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
 int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
 int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
 int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
-                          BN_CTX *);
+    BN_CTX *);
 
 int BN_BLINDING_is_current_thread(BN_BLINDING *b);
 void BN_BLINDING_set_current_thread(BN_BLINDING *b);
@@ -439,32 +438,32 @@ int BN_BLINDING_unlock(BN_BLINDING *b);
 unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
 void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
 BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-                                      const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
-                                      int (*bn_mod_exp) (BIGNUM *r,
-                                                         const BIGNUM *a,
-                                                         const BIGNUM *p,
-                                                         const BIGNUM *m,
-                                                         BN_CTX *ctx,
-                                                         BN_MONT_CTX *m_ctx),
-                                      BN_MONT_CTX *m_ctx);
-# ifndef OPENSSL_NO_DEPRECATED_0_9_8
+    const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
+    int (*bn_mod_exp)(BIGNUM *r,
+        const BIGNUM *a,
+        const BIGNUM *p,
+        const BIGNUM *m,
+        BN_CTX *ctx,
+        BN_MONT_CTX *m_ctx),
+    BN_MONT_CTX *m_ctx);
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
 OSSL_DEPRECATEDIN_0_9_8
 void BN_set_params(int mul, int high, int low, int mont);
 OSSL_DEPRECATEDIN_0_9_8
 int BN_get_params(int which); /* 0, mul, 1 high, 2 low, 3 mont */
-# endif
+#endif
 
 BN_RECP_CTX *BN_RECP_CTX_new(void);
 void BN_RECP_CTX_free(BN_RECP_CTX *recp);
 int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *rdiv, BN_CTX *ctx);
 int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
-                          BN_RECP_CTX *recp, BN_CTX *ctx);
+    BN_RECP_CTX *recp, BN_CTX *ctx);
 int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx);
+    const BIGNUM *m, BN_CTX *ctx);
 int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
-                BN_RECP_CTX *recp, BN_CTX *ctx);
+    BN_RECP_CTX *recp, BN_CTX *ctx);
 
-# ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 
 /*
  * Functions for arithmetic over binary polynomials represented by BIGNUMs.
@@ -477,31 +476,31 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
  * r = a + b
  */
 int BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-#  define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
+#define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
 /*
  * r=a mod p
  */
 int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p);
 /* r = (a * b) mod p */
 int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
+    const BIGNUM *p, BN_CTX *ctx);
 /* r = (a * a) mod p */
 int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
 /* r = (1 / b) mod p */
 int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx);
 /* r = (a / b) mod p */
 int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
+    const BIGNUM *p, BN_CTX *ctx);
 /* r = (a ^ b) mod p */
 int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
+    const BIGNUM *p, BN_CTX *ctx);
 /* r = sqrt(a) mod p */
 int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                     BN_CTX *ctx);
+    BN_CTX *ctx);
 /* r^2 + r = a mod p */
 int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                           BN_CTX *ctx);
-#  define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
+    BN_CTX *ctx);
+#define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
 /*-
  * Some functions allow for representation of the irreducible polynomials
  * as an unsigned int[], say p.  The irreducible f(t) is then of the form:
@@ -512,29 +511,29 @@ int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);
 /* r = (a * b) mod p */
 int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
+    const int p[], BN_CTX *ctx);
 /* r = (a * a) mod p */
 int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-                        BN_CTX *ctx);
+    BN_CTX *ctx);
 /* r = (1 / b) mod p */
 int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p[],
-                        BN_CTX *ctx);
+    BN_CTX *ctx);
 /* r = (a / b) mod p */
 int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
+    const int p[], BN_CTX *ctx);
 /* r = (a ^ b) mod p */
 int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
+    const int p[], BN_CTX *ctx);
 /* r = sqrt(a) mod p */
 int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
-                         const int p[], BN_CTX *ctx);
+    const int p[], BN_CTX *ctx);
 /* r^2 + r = a mod p */
 int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
-                               const int p[], BN_CTX *ctx);
+    const int p[], BN_CTX *ctx);
 int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
 int BN_GF2m_arr2poly(const int p[], BIGNUM *a);
 
-# endif
+#endif
 
 /*
  * faster mod functions for the 'NIST primes' 0 <= a < p^2
@@ -551,12 +550,12 @@ const BIGNUM *BN_get0_nist_prime_256(void);
 const BIGNUM *BN_get0_nist_prime_384(void);
 const BIGNUM *BN_get0_nist_prime_521(void);
 
-int (*BN_nist_mod_func(const BIGNUM *p)) (BIGNUM *r, const BIGNUM *a,
-                                          const BIGNUM *field, BN_CTX *ctx);
+int (*BN_nist_mod_func(const BIGNUM *p))(BIGNUM *r, const BIGNUM *a,
+    const BIGNUM *field, BN_CTX *ctx);
 
 int BN_generate_dsa_nonce(BIGNUM *out, const BIGNUM *range,
-                          const BIGNUM *priv, const unsigned char *message,
-                          size_t message_len, BN_CTX *ctx);
+    const BIGNUM *priv, const unsigned char *message,
+    size_t message_len, BN_CTX *ctx);
 
 /* Primes from RFC 2409 */
 BIGNUM *BN_get_rfc2409_prime_768(BIGNUM *bn);
@@ -570,21 +569,20 @@ BIGNUM *BN_get_rfc3526_prime_4096(BIGNUM *bn);
 BIGNUM *BN_get_rfc3526_prime_6144(BIGNUM *bn);
 BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn);
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   define get_rfc2409_prime_768 BN_get_rfc2409_prime_768
-#   define get_rfc2409_prime_1024 BN_get_rfc2409_prime_1024
-#   define get_rfc3526_prime_1536 BN_get_rfc3526_prime_1536
-#   define get_rfc3526_prime_2048 BN_get_rfc3526_prime_2048
-#   define get_rfc3526_prime_3072 BN_get_rfc3526_prime_3072
-#   define get_rfc3526_prime_4096 BN_get_rfc3526_prime_4096
-#   define get_rfc3526_prime_6144 BN_get_rfc3526_prime_6144
-#   define get_rfc3526_prime_8192 BN_get_rfc3526_prime_8192
-#  endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define get_rfc2409_prime_768 BN_get_rfc2409_prime_768
+#define get_rfc2409_prime_1024 BN_get_rfc2409_prime_1024
+#define get_rfc3526_prime_1536 BN_get_rfc3526_prime_1536
+#define get_rfc3526_prime_2048 BN_get_rfc3526_prime_2048
+#define get_rfc3526_prime_3072 BN_get_rfc3526_prime_3072
+#define get_rfc3526_prime_4096 BN_get_rfc3526_prime_4096
+#define get_rfc3526_prime_6144 BN_get_rfc3526_prime_6144
+#define get_rfc3526_prime_8192 BN_get_rfc3526_prime_8192
+#endif
 
 int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
 
-
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h
index 7c3f6ef3d4ba..dbbcd699bba4 100644
--- a/include/openssl/bnerr.h
+++ b/include/openssl/bnerr.h
@@ -9,39 +9,37 @@
  */
 
 #ifndef OPENSSL_BNERR_H
-# define OPENSSL_BNERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_BNERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * BN reason codes.
  */
-# define BN_R_ARG2_LT_ARG3                                100
-# define BN_R_BAD_RECIPROCAL                              101
-# define BN_R_BIGNUM_TOO_LONG                             114
-# define BN_R_BITS_TOO_SMALL                              118
-# define BN_R_CALLED_WITH_EVEN_MODULUS                    102
-# define BN_R_DIV_BY_ZERO                                 103
-# define BN_R_ENCODING_ERROR                              104
-# define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA                105
-# define BN_R_INPUT_NOT_REDUCED                           110
-# define BN_R_INVALID_LENGTH                              106
-# define BN_R_INVALID_RANGE                               115
-# define BN_R_INVALID_SHIFT                               119
-# define BN_R_NOT_A_SQUARE                                111
-# define BN_R_NOT_INITIALIZED                             107
-# define BN_R_NO_INVERSE                                  108
-# define BN_R_NO_PRIME_CANDIDATE                          121
-# define BN_R_NO_SOLUTION                                 116
-# define BN_R_NO_SUITABLE_DIGEST                          120
-# define BN_R_PRIVATE_KEY_TOO_LARGE                       117
-# define BN_R_P_IS_NOT_PRIME                              112
-# define BN_R_TOO_MANY_ITERATIONS                         113
-# define BN_R_TOO_MANY_TEMPORARY_VARIABLES                109
+#define BN_R_ARG2_LT_ARG3 100
+#define BN_R_BAD_RECIPROCAL 101
+#define BN_R_BIGNUM_TOO_LONG 114
+#define BN_R_BITS_TOO_SMALL 118
+#define BN_R_CALLED_WITH_EVEN_MODULUS 102
+#define BN_R_DIV_BY_ZERO 103
+#define BN_R_ENCODING_ERROR 104
+#define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA 105
+#define BN_R_INPUT_NOT_REDUCED 110
+#define BN_R_INVALID_LENGTH 106
+#define BN_R_INVALID_RANGE 115
+#define BN_R_INVALID_SHIFT 119
+#define BN_R_NOT_A_SQUARE 111
+#define BN_R_NOT_INITIALIZED 107
+#define BN_R_NO_INVERSE 108
+#define BN_R_NO_PRIME_CANDIDATE 121
+#define BN_R_NO_SOLUTION 116
+#define BN_R_NO_SUITABLE_DIGEST 120
+#define BN_R_PRIVATE_KEY_TOO_LARGE 117
+#define BN_R_P_IS_NOT_PRIME 112
+#define BN_R_TOO_MANY_ITERATIONS 113
+#define BN_R_TOO_MANY_TEMPORARY_VARIABLES 109
 
 #endif
diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h
index 5773b986bd21..09b35e8e18e8 100644
--- a/include/openssl/buffer.h
+++ b/include/openssl/buffer.h
@@ -8,45 +8,44 @@
  */
 
 #ifndef OPENSSL_BUFFER_H
-# define OPENSSL_BUFFER_H
-# pragma once
+#define OPENSSL_BUFFER_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_BUFFER_H
-# endif
-
-# include <openssl/types.h>
-# ifndef OPENSSL_CRYPTO_H
-#  include <openssl/crypto.h>
-# endif
-# include <openssl/buffererr.h>
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_BUFFER_H
+#endif
 
+#include <openssl/types.h>
+#ifndef OPENSSL_CRYPTO_H
+#include <openssl/crypto.h>
+#endif
+#include <openssl/buffererr.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# include <stddef.h>
-# include <sys/types.h>
+#include <stddef.h>
+#include <sys/types.h>
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define BUF_strdup(s) OPENSSL_strdup(s)
-#  define BUF_strndup(s, size) OPENSSL_strndup(s, size)
-#  define BUF_memdup(data, size) OPENSSL_memdup(data, size)
-#  define BUF_strlcpy(dst, src, size)  OPENSSL_strlcpy(dst, src, size)
-#  define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
-#  define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define BUF_strdup(s) OPENSSL_strdup(s)
+#define BUF_strndup(s, size) OPENSSL_strndup(s, size)
+#define BUF_memdup(data, size) OPENSSL_memdup(data, size)
+#define BUF_strlcpy(dst, src, size) OPENSSL_strlcpy(dst, src, size)
+#define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
+#define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
+#endif
 
 struct buf_mem_st {
-    size_t length;              /* current number of bytes */
+    size_t length; /* current number of bytes */
     char *data;
-    size_t max;                 /* size of buffer */
+    size_t max; /* size of buffer */
     unsigned long flags;
 };
 
-# define BUF_MEM_FLAG_SECURE  0x01
+#define BUF_MEM_FLAG_SECURE 0x01
 
 BUF_MEM *BUF_MEM_new(void);
 BUF_MEM *BUF_MEM_new_ex(unsigned long flags);
@@ -55,8 +54,7 @@ size_t BUF_MEM_grow(BUF_MEM *str, size_t len);
 size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
 void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
 
-
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h
index d18b1f8f0735..4fa0da44be23 100644
--- a/include/openssl/buffererr.h
+++ b/include/openssl/buffererr.h
@@ -9,14 +9,12 @@
  */
 
 #ifndef OPENSSL_BUFFERERR_H
-# define OPENSSL_BUFFERERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_BUFFERERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * BUF reason codes.
diff --git a/include/openssl/byteorder.h b/include/openssl/byteorder.h
index 3c8f34b29182..393f34b1c3d3 100644
--- a/include/openssl/byteorder.h
+++ b/include/openssl/byteorder.h
@@ -8,11 +8,11 @@
  */
 
 #ifndef OPENSSL_BYTEORDER_H
-# define OPENSSL_BYTEORDER_H
-# pragma once
+#define OPENSSL_BYTEORDER_H
+#pragma once
 
-# include <openssl/e_os2.h>
-# include <string.h>
+#include <openssl/e_os2.h>
+#include <string.h>
 
 /*
  * "Modern" compilers do a decent job of optimising these functions to just a
@@ -20,150 +20,150 @@
  * swapping is required, or a suitable swap instruction is available.
  */
 
-# if defined(_MSC_VER) && _MSC_VER>=1300
-#  include <stdlib.h>
-#  pragma intrinsic(_byteswap_ushort)
-#  pragma intrinsic(_byteswap_ulong)
-#  pragma intrinsic(_byteswap_uint64)
-#  define OSSL_HTOBE16(x) _byteswap_ushort(x)
-#  define OSSL_HTOBE32(x) _byteswap_ulong(x)
-#  define OSSL_HTOBE64(x) _byteswap_uint64(x)
-#  define OSSL_BE16TOH(x) _byteswap_ushort(x)
-#  define OSSL_BE32TOH(x) _byteswap_ulong(x)
-#  define OSSL_BE64TOH(x) _byteswap_uint64(x)
-#  define OSSL_HTOLE16(x) (x)
-#  define OSSL_HTOLE32(x) (x)
-#  define OSSL_HTOLE64(x) (x)
-#  define OSSL_LE16TOH(x) (x)
-#  define OSSL_LE32TOH(x) (x)
-#  define OSSL_LE64TOH(x) (x)
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#include <stdlib.h>
+#pragma intrinsic(_byteswap_ushort)
+#pragma intrinsic(_byteswap_ulong)
+#pragma intrinsic(_byteswap_uint64)
+#define OSSL_HTOBE16(x) _byteswap_ushort(x)
+#define OSSL_HTOBE32(x) _byteswap_ulong(x)
+#define OSSL_HTOBE64(x) _byteswap_uint64(x)
+#define OSSL_BE16TOH(x) _byteswap_ushort(x)
+#define OSSL_BE32TOH(x) _byteswap_ulong(x)
+#define OSSL_BE64TOH(x) _byteswap_uint64(x)
+#define OSSL_HTOLE16(x) (x)
+#define OSSL_HTOLE32(x) (x)
+#define OSSL_HTOLE64(x) (x)
+#define OSSL_LE16TOH(x) (x)
+#define OSSL_LE32TOH(x) (x)
+#define OSSL_LE64TOH(x) (x)
 
-# elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#  if (__GLIBC_PREREQ(2, 19)) && defined(_DEFAULT_SOURCE)
-#   include <endian.h>
-#   define OSSL_HTOBE16(x) htobe16(x)
-#   define OSSL_HTOBE32(x) htobe32(x)
-#   define OSSL_HTOBE64(x) htobe64(x)
-#   define OSSL_BE16TOH(x) be16toh(x)
-#   define OSSL_BE32TOH(x) be32toh(x)
-#   define OSSL_BE64TOH(x) be64toh(x)
-#   define OSSL_HTOLE16(x) htole16(x)
-#   define OSSL_HTOLE32(x) htole32(x)
-#   define OSSL_HTOLE64(x) htole64(x)
-#   define OSSL_LE16TOH(x) le16toh(x)
-#   define OSSL_LE32TOH(x) le32toh(x)
-#   define OSSL_LE64TOH(x) le64toh(x)
-#  endif
+#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if (__GLIBC_PREREQ(2, 19)) && defined(_DEFAULT_SOURCE)
+#include <endian.h>
+#define OSSL_HTOBE16(x) htobe16(x)
+#define OSSL_HTOBE32(x) htobe32(x)
+#define OSSL_HTOBE64(x) htobe64(x)
+#define OSSL_BE16TOH(x) be16toh(x)
+#define OSSL_BE32TOH(x) be32toh(x)
+#define OSSL_BE64TOH(x) be64toh(x)
+#define OSSL_HTOLE16(x) htole16(x)
+#define OSSL_HTOLE32(x) htole32(x)
+#define OSSL_HTOLE64(x) htole64(x)
+#define OSSL_LE16TOH(x) le16toh(x)
+#define OSSL_LE32TOH(x) le32toh(x)
+#define OSSL_LE64TOH(x) le64toh(x)
+#endif
 
-# elif defined(__FreeBSD__) || defined(__NetBSD__) || defined (__OpenBSD__)
-#  if defined(__OpenBSD__)
-#   include <sys/types.h>
-#  else
-#   include <sys/endian.h>
-#  endif
-#  define OSSL_HTOBE16(x) htobe16(x)
-#  define OSSL_HTOBE32(x) htobe32(x)
-#  define OSSL_HTOBE64(x) htobe64(x)
-#  define OSSL_BE16TOH(x) be16toh(x)
-#  define OSSL_BE32TOH(x) be32toh(x)
-#  define OSSL_BE64TOH(x) be64toh(x)
-#  define OSSL_HTOLE16(x) htole16(x)
-#  define OSSL_HTOLE32(x) htole32(x)
-#  define OSSL_HTOLE64(x) htole64(x)
-#  define OSSL_LE16TOH(x) le16toh(x)
-#  define OSSL_LE32TOH(x) le32toh(x)
-#  define OSSL_LE64TOH(x) le64toh(x)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__OpenBSD__)
+#include <sys/types.h>
+#else
+#include <sys/endian.h>
+#endif
+#define OSSL_HTOBE16(x) htobe16(x)
+#define OSSL_HTOBE32(x) htobe32(x)
+#define OSSL_HTOBE64(x) htobe64(x)
+#define OSSL_BE16TOH(x) be16toh(x)
+#define OSSL_BE32TOH(x) be32toh(x)
+#define OSSL_BE64TOH(x) be64toh(x)
+#define OSSL_HTOLE16(x) htole16(x)
+#define OSSL_HTOLE32(x) htole32(x)
+#define OSSL_HTOLE64(x) htole64(x)
+#define OSSL_LE16TOH(x) le16toh(x)
+#define OSSL_LE32TOH(x) le32toh(x)
+#define OSSL_LE64TOH(x) le64toh(x)
 
-# elif defined(__APPLE__)
-#  include <libkern/OSByteOrder.h>
-#  define OSSL_HTOBE16(x) OSSwapHostToBigInt16(x)
-#  define OSSL_HTOBE32(x) OSSwapHostToBigInt32(x)
-#  define OSSL_HTOBE64(x) OSSwapHostToBigInt64(x)
-#  define OSSL_BE16TOH(x) OSSwapBigToHostInt16(x)
-#  define OSSL_BE32TOH(x) OSSwapBigToHostInt32(x)
-#  define OSSL_BE64TOH(x) OSSwapBigToHostInt64(x)
-#  define OSSL_HTOLE16(x) OSSwapHostToLittleInt16(x)
-#  define OSSL_HTOLE32(x) OSSwapHostToLittleInt32(x)
-#  define OSSL_HTOLE64(x) OSSwapHostToLittleInt64(x)
-#  define OSSL_LE16TOH(x) OSSwapLittleToHostInt16(x)
-#  define OSSL_LE32TOH(x) OSSwapLittleToHostInt32(x)
-#  define OSSL_LE64TOH(x) OSSwapLittleToHostInt64(x)
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define OSSL_HTOBE16(x) OSSwapHostToBigInt16(x)
+#define OSSL_HTOBE32(x) OSSwapHostToBigInt32(x)
+#define OSSL_HTOBE64(x) OSSwapHostToBigInt64(x)
+#define OSSL_BE16TOH(x) OSSwapBigToHostInt16(x)
+#define OSSL_BE32TOH(x) OSSwapBigToHostInt32(x)
+#define OSSL_BE64TOH(x) OSSwapBigToHostInt64(x)
+#define OSSL_HTOLE16(x) OSSwapHostToLittleInt16(x)
+#define OSSL_HTOLE32(x) OSSwapHostToLittleInt32(x)
+#define OSSL_HTOLE64(x) OSSwapHostToLittleInt64(x)
+#define OSSL_LE16TOH(x) OSSwapLittleToHostInt16(x)
+#define OSSL_LE32TOH(x) OSSwapLittleToHostInt32(x)
+#define OSSL_LE64TOH(x) OSSwapLittleToHostInt64(x)
 
-# endif
+#endif
 
 static ossl_inline ossl_unused unsigned char *
 OPENSSL_store_u16_le(unsigned char *out, uint16_t val)
 {
-# ifdef OSSL_HTOLE16
+#ifdef OSSL_HTOLE16
     uint16_t t = OSSL_HTOLE16(val);
 
     memcpy(out, (unsigned char *)&t, 2);
     return out + 2;
-# else
+#else
     *out++ = (val & 0xff);
     *out++ = (val >> 8) & 0xff;
     return out;
-# endif
+#endif
 }
 
 static ossl_inline ossl_unused unsigned char *
 OPENSSL_store_u16_be(unsigned char *out, uint16_t val)
 {
-# ifdef OSSL_HTOBE16
+#ifdef OSSL_HTOBE16
     uint16_t t = OSSL_HTOBE16(val);
 
     memcpy(out, (unsigned char *)&t, 2);
     return out + 2;
-# else
+#else
     *out++ = (val >> 8) & 0xff;
     *out++ = (val & 0xff);
     return out;
-# endif
+#endif
 }
 
 static ossl_inline ossl_unused unsigned char *
 OPENSSL_store_u32_le(unsigned char *out, uint32_t val)
 {
-# ifdef OSSL_HTOLE32
+#ifdef OSSL_HTOLE32
     uint32_t t = OSSL_HTOLE32(val);
 
     memcpy(out, (unsigned char *)&t, 4);
     return out + 4;
-# else
+#else
     *out++ = (val & 0xff);
     *out++ = (val >> 8) & 0xff;
     *out++ = (val >> 16) & 0xff;
     *out++ = (val >> 24) & 0xff;
     return out;
-# endif
+#endif
 }
 
 static ossl_inline ossl_unused unsigned char *
 OPENSSL_store_u32_be(unsigned char *out, uint32_t val)
 {
-# ifdef OSSL_HTOBE32
+#ifdef OSSL_HTOBE32
     uint32_t t = OSSL_HTOBE32(val);
 
     memcpy(out, (unsigned char *)&t, 4);
     return out + 4;
-# else
+#else
     *out++ = (val >> 24) & 0xff;
     *out++ = (val >> 16) & 0xff;
     *out++ = (val >> 8) & 0xff;
     *out++ = (val & 0xff);
     return out;
-# endif
+#endif
 }
 
 static ossl_inline ossl_unused unsigned char *
 OPENSSL_store_u64_le(unsigned char *out, uint64_t val)
 {
-# ifdef OSSL_HTOLE64
+#ifdef OSSL_HTOLE64
     uint64_t t = OSSL_HTOLE64(val);
 
     memcpy(out, (unsigned char *)&t, 8);
     return out + 8;
-# else
+#else
     *out++ = (val & 0xff);
     *out++ = (val >> 8) & 0xff;
     *out++ = (val >> 16) & 0xff;
@@ -173,18 +173,18 @@ OPENSSL_store_u64_le(unsigned char *out, uint64_t val)
     *out++ = (val >> 48) & 0xff;
     *out++ = (val >> 56) & 0xff;
     return out;
-# endif
+#endif
 }
 
 static ossl_inline ossl_unused unsigned char *
 OPENSSL_store_u64_be(unsigned char *out, uint64_t val)
 {
-# ifdef OSSL_HTOLE64
+#ifdef OSSL_HTOLE64
     uint64_t t = OSSL_HTOBE64(val);
 
     memcpy(out, (unsigned char *)&t, 8);
     return out + 8;
-# else
+#else
     *out++ = (val >> 56) & 0xff;
     *out++ = (val >> 48) & 0xff;
     *out++ = (val >> 40) & 0xff;
@@ -194,19 +194,19 @@ OPENSSL_store_u64_be(unsigned char *out, uint64_t val)
     *out++ = (val >> 8) & 0xff;
     *out++ = (val & 0xff);
     return out;
-# endif
+#endif
 }
 
 static ossl_inline ossl_unused const unsigned char *
 OPENSSL_load_u16_le(uint16_t *val, const unsigned char *in)
 {
-# ifdef OSSL_LE16TOH
+#ifdef OSSL_LE16TOH
     uint16_t t;
 
     memcpy((unsigned char *)&t, in, 2);
     *val = OSSL_LE16TOH(t);
     return in + 2;
-# else
+#else
     uint16_t b0 = *in++;
     uint16_t b1 = *in++;
 
@@ -218,13 +218,13 @@ OPENSSL_load_u16_le(uint16_t *val, const unsigned char *in)
 static ossl_inline ossl_unused const unsigned char *
 OPENSSL_load_u16_be(uint16_t *val, const unsigned char *in)
 {
-# ifdef OSSL_LE16TOH
+#ifdef OSSL_LE16TOH
     uint16_t t;
 
     memcpy((unsigned char *)&t, in, 2);
     *val = OSSL_BE16TOH(t);
     return in + 2;
-# else
+#else
     uint16_t b1 = *in++;
     uint16_t b0 = *in++;
 
@@ -236,13 +236,13 @@ OPENSSL_load_u16_be(uint16_t *val, const unsigned char *in)
 static ossl_inline ossl_unused const unsigned char *
 OPENSSL_load_u32_le(uint32_t *val, const unsigned char *in)
 {
-# ifdef OSSL_LE32TOH
+#ifdef OSSL_LE32TOH
     uint32_t t;
 
     memcpy((unsigned char *)&t, in, 4);
     *val = OSSL_LE32TOH(t);
     return in + 4;
-# else
+#else
     uint32_t b0 = *in++;
     uint32_t b1 = *in++;
     uint32_t b2 = *in++;
@@ -256,13 +256,13 @@ OPENSSL_load_u32_le(uint32_t *val, const unsigned char *in)
 static ossl_inline ossl_unused const unsigned char *
 OPENSSL_load_u32_be(uint32_t *val, const unsigned char *in)
 {
-# ifdef OSSL_LE32TOH
+#ifdef OSSL_LE32TOH
     uint32_t t;
 
     memcpy((unsigned char *)&t, in, 4);
     *val = OSSL_BE32TOH(t);
     return in + 4;
-# else
+#else
     uint32_t b3 = *in++;
     uint32_t b2 = *in++;
     uint32_t b1 = *in++;
@@ -276,13 +276,13 @@ OPENSSL_load_u32_be(uint32_t *val, const unsigned char *in)
 static ossl_inline ossl_unused const unsigned char *
 OPENSSL_load_u64_le(uint64_t *val, const unsigned char *in)
 {
-# ifdef OSSL_LE64TOH
+#ifdef OSSL_LE64TOH
     uint64_t t;
 
     memcpy((unsigned char *)&t, in, 8);
     *val = OSSL_LE64TOH(t);
     return in + 8;
-# else
+#else
     uint64_t b0 = *in++;
     uint64_t b1 = *in++;
     uint64_t b2 = *in++;
@@ -301,13 +301,13 @@ OPENSSL_load_u64_le(uint64_t *val, const unsigned char *in)
 static ossl_inline ossl_unused const unsigned char *
 OPENSSL_load_u64_be(uint64_t *val, const unsigned char *in)
 {
-# ifdef OSSL_LE64TOH
+#ifdef OSSL_LE64TOH
     uint64_t t;
 
     memcpy((unsigned char *)&t, in, 8);
     *val = OSSL_BE64TOH(t);
     return in + 8;
-# else
+#else
     uint64_t b7 = *in++;
     uint64_t b6 = *in++;
     uint64_t b5 = *in++;
@@ -323,17 +323,17 @@ OPENSSL_load_u64_be(uint64_t *val, const unsigned char *in)
 #endif
 }
 
-# undef OSSL_HTOBE16
-# undef OSSL_HTOBE32
-# undef OSSL_HTOBE64
-# undef OSSL_BE16TOH
-# undef OSSL_BE32TOH
-# undef OSSL_BE64TOH
-# undef OSSL_HTOLE16
-# undef OSSL_HTOLE32
-# undef OSSL_HTOLE64
-# undef OSSL_LE16TOH
-# undef OSSL_LE32TOH
-# undef OSSL_LE64TOH
+#undef OSSL_HTOBE16
+#undef OSSL_HTOBE32
+#undef OSSL_HTOBE64
+#undef OSSL_BE16TOH
+#undef OSSL_BE32TOH
+#undef OSSL_BE64TOH
+#undef OSSL_HTOLE16
+#undef OSSL_HTOLE32
+#undef OSSL_HTOLE64
+#undef OSSL_LE16TOH
+#undef OSSL_LE32TOH
+#undef OSSL_LE64TOH
 
 #endif
diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h
index 88c2279e90f1..aec94e4efc94 100644
--- a/include/openssl/camellia.h
+++ b/include/openssl/camellia.h
@@ -8,28 +8,28 @@
  */
 
 #ifndef OPENSSL_CAMELLIA_H
-# define OPENSSL_CAMELLIA_H
-# pragma once
+#define OPENSSL_CAMELLIA_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CAMELLIA_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CAMELLIA_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_CAMELLIA
-# include <stddef.h>
-#ifdef  __cplusplus
+#ifndef OPENSSL_NO_CAMELLIA
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define CAMELLIA_BLOCK_SIZE 16
+#define CAMELLIA_BLOCK_SIZE 16
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
-#  define CAMELLIA_ENCRYPT        1
-#  define CAMELLIA_DECRYPT        0
+#define CAMELLIA_ENCRYPT 1
+#define CAMELLIA_DECRYPT 0
 
 /*
  * Because array size can't be a const in C, the following two are macros.
@@ -38,80 +38,80 @@ extern "C" {
 
 /* This should be a hidden type, but EVP requires that the size be known */
 
-#  define CAMELLIA_TABLE_BYTE_LEN 272
-#  define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
+#define CAMELLIA_TABLE_BYTE_LEN 272
+#define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
 
 typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match
                                                                * with WORD */
 
 struct camellia_key_st {
     union {
-        double d;               /* ensures 64-bit align */
+        double d; /* ensures 64-bit align */
         KEY_TABLE_TYPE rd_key;
     } u;
     int grand_rounds;
 };
 typedef struct camellia_key_st CAMELLIA_KEY;
 
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int Camellia_set_key(const unsigned char *userKey,
-                                           const int bits,
-                                           CAMELLIA_KEY *key);
+    const int bits,
+    CAMELLIA_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void Camellia_encrypt(const unsigned char *in,
-                                            unsigned char *out,
-                                            const CAMELLIA_KEY *key);
+    unsigned char *out,
+    const CAMELLIA_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void Camellia_decrypt(const unsigned char *in,
-                                            unsigned char *out,
-                                            const CAMELLIA_KEY *key);
+    unsigned char *out,
+    const CAMELLIA_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void Camellia_ecb_encrypt(const unsigned char *in,
-                                                unsigned char *out,
-                                                const CAMELLIA_KEY *key,
-                                                const int enc);
+    unsigned char *out,
+    const CAMELLIA_KEY *key,
+    const int enc);
 OSSL_DEPRECATEDIN_3_0 void Camellia_cbc_encrypt(const unsigned char *in,
-                                                unsigned char *out,
-                                                size_t length,
-                                                const CAMELLIA_KEY *key,
-                                                unsigned char *ivec,
-                                                const int enc);
+    unsigned char *out,
+    size_t length,
+    const CAMELLIA_KEY *key,
+    unsigned char *ivec,
+    const int enc);
 OSSL_DEPRECATEDIN_3_0 void Camellia_cfb128_encrypt(const unsigned char *in,
-                                                   unsigned char *out,
-                                                   size_t length,
-                                                   const CAMELLIA_KEY *key,
-                                                   unsigned char *ivec,
-                                                   int *num,
-                                                   const int enc);
+    unsigned char *out,
+    size_t length,
+    const CAMELLIA_KEY *key,
+    unsigned char *ivec,
+    int *num,
+    const int enc);
 OSSL_DEPRECATEDIN_3_0 void Camellia_cfb1_encrypt(const unsigned char *in,
-                                                 unsigned char *out,
-                                                 size_t length,
-                                                 const CAMELLIA_KEY *key,
-                                                 unsigned char *ivec,
-                                                 int *num,
-                                                 const int enc);
+    unsigned char *out,
+    size_t length,
+    const CAMELLIA_KEY *key,
+    unsigned char *ivec,
+    int *num,
+    const int enc);
 OSSL_DEPRECATEDIN_3_0 void Camellia_cfb8_encrypt(const unsigned char *in,
-                                                 unsigned char *out,
-                                                 size_t length,
-                                                 const CAMELLIA_KEY *key,
-                                                 unsigned char *ivec,
-                                                 int *num,
-                                                 const int enc);
+    unsigned char *out,
+    size_t length,
+    const CAMELLIA_KEY *key,
+    unsigned char *ivec,
+    int *num,
+    const int enc);
 OSSL_DEPRECATEDIN_3_0 void Camellia_ofb128_encrypt(const unsigned char *in,
-                                                   unsigned char *out,
-                                                   size_t length,
-                                                   const CAMELLIA_KEY *key,
-                                                   unsigned char *ivec,
-                                                   int *num);
+    unsigned char *out,
+    size_t length,
+    const CAMELLIA_KEY *key,
+    unsigned char *ivec,
+    int *num);
 OSSL_DEPRECATEDIN_3_0
 void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char ivec[CAMELLIA_BLOCK_SIZE],
-                             unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
-                             unsigned int *num);
-# endif
+    size_t length, const CAMELLIA_KEY *key,
+    unsigned char ivec[CAMELLIA_BLOCK_SIZE],
+    unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
+    unsigned int *num);
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/cast.h b/include/openssl/cast.h
index 0bf217beab23..af943124821d 100644
--- a/include/openssl/cast.h
+++ b/include/openssl/cast.h
@@ -8,64 +8,64 @@
  */
 
 #ifndef OPENSSL_CAST_H
-# define OPENSSL_CAST_H
-# pragma once
+#define OPENSSL_CAST_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CAST_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CAST_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_CAST
-# ifdef  __cplusplus
+#ifndef OPENSSL_NO_CAST
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# define CAST_BLOCK      8
-# define CAST_KEY_LENGTH 16
+#define CAST_BLOCK 8
+#define CAST_KEY_LENGTH 16
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
-#  define CAST_ENCRYPT    1
-#  define CAST_DECRYPT    0
+#define CAST_ENCRYPT 1
+#define CAST_DECRYPT 0
 
-#  define CAST_LONG unsigned int
+#define CAST_LONG unsigned int
 
 typedef struct cast_key_st {
     CAST_LONG data[32];
-    int short_key;              /* Use reduced rounds for short key */
+    int short_key; /* Use reduced rounds for short key */
 } CAST_KEY;
 
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
 OSSL_DEPRECATEDIN_3_0
 void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAST_KEY *key, int enc);
+    const CAST_KEY *key, int enc);
 OSSL_DEPRECATEDIN_3_0
 void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
 OSSL_DEPRECATEDIN_3_0
 void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
 OSSL_DEPRECATEDIN_3_0
 void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const CAST_KEY *ks, unsigned char *iv,
-                      int enc);
+    long length, const CAST_KEY *ks, unsigned char *iv,
+    int enc);
 OSSL_DEPRECATEDIN_3_0
 void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num, int enc);
+    long length, const CAST_KEY *schedule,
+    unsigned char *ivec, int *num, int enc);
 OSSL_DEPRECATEDIN_3_0
 void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num);
-# endif
+    long length, const CAST_KEY *schedule,
+    unsigned char *ivec, int *num);
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/cmac.h b/include/openssl/cmac.h
index f50861836f48..c72da7ecdcb0 100644
--- a/include/openssl/cmac.h
+++ b/include/openssl/cmac.h
@@ -8,45 +8,45 @@
  */
 
 #ifndef OPENSSL_CMAC_H
-# define OPENSSL_CMAC_H
-# pragma once
+#define OPENSSL_CMAC_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CMAC_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CMAC_H
+#endif
 
-# ifndef OPENSSL_NO_CMAC
+#ifndef OPENSSL_NO_CMAC
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  include <openssl/evp.h>
+#include <openssl/evp.h>
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* Opaque */
 typedef struct CMAC_CTX_st CMAC_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 CMAC_CTX *CMAC_CTX_new(void);
 OSSL_DEPRECATEDIN_3_0 void CMAC_CTX_cleanup(CMAC_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 void CMAC_CTX_free(CMAC_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in);
 OSSL_DEPRECATEDIN_3_0 int CMAC_Init(CMAC_CTX *ctx,
-                                    const void *key, size_t keylen,
-                                    const EVP_CIPHER *cipher, ENGINE *impl);
+    const void *key, size_t keylen,
+    const EVP_CIPHER *cipher, ENGINE *impl);
 OSSL_DEPRECATEDIN_3_0 int CMAC_Update(CMAC_CTX *ctx,
-                                      const void *data, size_t dlen);
+    const void *data, size_t dlen);
 OSSL_DEPRECATEDIN_3_0 int CMAC_Final(CMAC_CTX *ctx,
-                                     unsigned char *out, size_t *poutlen);
+    unsigned char *out, size_t *poutlen);
 OSSL_DEPRECATEDIN_3_0 int CMAC_resume(CMAC_CTX *ctx);
-#  endif
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
+#endif
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/cmp.h.in b/include/openssl/cmp.h.in
index d659331fa38f..b600aa6bbdd3 100644
--- a/include/openssl/cmp.h.in
+++ b/include/openssl/cmp.h.in
@@ -11,34 +11,36 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_CMP_H
-# define OPENSSL_CMP_H
+#define OPENSSL_CMP_H
 
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_CMP
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_CMP
 
-#  include <openssl/crmf.h>
-#  include <openssl/cmperr.h>
-#  include <openssl/cmp_util.h>
-#  include <openssl/http.h>
+#include <openssl/crmf.h>
+#include <openssl/cmperr.h>
+#include <openssl/cmp_util.h>
+#include <openssl/http.h>
 
 /* explicit #includes not strictly needed since implied by the above: */
-#  include <openssl/types.h>
-#  include <openssl/safestack.h>
-#  include <openssl/x509.h>
-#  include <openssl/x509v3.h>
+#include <openssl/types.h>
+#include <openssl/safestack.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define OSSL_CMP_PVNO_2 2
-#  define OSSL_CMP_PVNO_3 3
-#  define OSSL_CMP_PVNO OSSL_CMP_PVNO_2 /* v2 is the default */
+#define OSSL_CMP_PVNO_2 2
+#define OSSL_CMP_PVNO_3 3
+#define OSSL_CMP_PVNO OSSL_CMP_PVNO_2 /* v2 is the default */
 
 /*-
  *   PKIFailureInfo ::= BIT STRING {
@@ -107,68 +109,68 @@ extern "C" {
  *       -- certificate already exists
  *   }
  */
-#  define OSSL_CMP_PKIFAILUREINFO_badAlg 0
-#  define OSSL_CMP_PKIFAILUREINFO_badMessageCheck 1
-#  define OSSL_CMP_PKIFAILUREINFO_badRequest 2
-#  define OSSL_CMP_PKIFAILUREINFO_badTime 3
-#  define OSSL_CMP_PKIFAILUREINFO_badCertId 4
-#  define OSSL_CMP_PKIFAILUREINFO_badDataFormat 5
-#  define OSSL_CMP_PKIFAILUREINFO_wrongAuthority 6
-#  define OSSL_CMP_PKIFAILUREINFO_incorrectData 7
-#  define OSSL_CMP_PKIFAILUREINFO_missingTimeStamp 8
-#  define OSSL_CMP_PKIFAILUREINFO_badPOP 9
-#  define OSSL_CMP_PKIFAILUREINFO_certRevoked 10
-#  define OSSL_CMP_PKIFAILUREINFO_certConfirmed 11
-#  define OSSL_CMP_PKIFAILUREINFO_wrongIntegrity 12
-#  define OSSL_CMP_PKIFAILUREINFO_badRecipientNonce 13
-#  define OSSL_CMP_PKIFAILUREINFO_timeNotAvailable 14
-#  define OSSL_CMP_PKIFAILUREINFO_unacceptedPolicy 15
-#  define OSSL_CMP_PKIFAILUREINFO_unacceptedExtension 16
-#  define OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable 17
-#  define OSSL_CMP_PKIFAILUREINFO_badSenderNonce 18
-#  define OSSL_CMP_PKIFAILUREINFO_badCertTemplate 19
-#  define OSSL_CMP_PKIFAILUREINFO_signerNotTrusted 20
-#  define OSSL_CMP_PKIFAILUREINFO_transactionIdInUse 21
-#  define OSSL_CMP_PKIFAILUREINFO_unsupportedVersion 22
-#  define OSSL_CMP_PKIFAILUREINFO_notAuthorized 23
-#  define OSSL_CMP_PKIFAILUREINFO_systemUnavail 24
-#  define OSSL_CMP_PKIFAILUREINFO_systemFailure 25
-#  define OSSL_CMP_PKIFAILUREINFO_duplicateCertReq 26
-#  define OSSL_CMP_PKIFAILUREINFO_MAX 26
-#  define OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN \
+#define OSSL_CMP_PKIFAILUREINFO_badAlg 0
+#define OSSL_CMP_PKIFAILUREINFO_badMessageCheck 1
+#define OSSL_CMP_PKIFAILUREINFO_badRequest 2
+#define OSSL_CMP_PKIFAILUREINFO_badTime 3
+#define OSSL_CMP_PKIFAILUREINFO_badCertId 4
+#define OSSL_CMP_PKIFAILUREINFO_badDataFormat 5
+#define OSSL_CMP_PKIFAILUREINFO_wrongAuthority 6
+#define OSSL_CMP_PKIFAILUREINFO_incorrectData 7
+#define OSSL_CMP_PKIFAILUREINFO_missingTimeStamp 8
+#define OSSL_CMP_PKIFAILUREINFO_badPOP 9
+#define OSSL_CMP_PKIFAILUREINFO_certRevoked 10
+#define OSSL_CMP_PKIFAILUREINFO_certConfirmed 11
+#define OSSL_CMP_PKIFAILUREINFO_wrongIntegrity 12
+#define OSSL_CMP_PKIFAILUREINFO_badRecipientNonce 13
+#define OSSL_CMP_PKIFAILUREINFO_timeNotAvailable 14
+#define OSSL_CMP_PKIFAILUREINFO_unacceptedPolicy 15
+#define OSSL_CMP_PKIFAILUREINFO_unacceptedExtension 16
+#define OSSL_CMP_PKIFAILUREINFO_addInfoNotAvailable 17
+#define OSSL_CMP_PKIFAILUREINFO_badSenderNonce 18
+#define OSSL_CMP_PKIFAILUREINFO_badCertTemplate 19
+#define OSSL_CMP_PKIFAILUREINFO_signerNotTrusted 20
+#define OSSL_CMP_PKIFAILUREINFO_transactionIdInUse 21
+#define OSSL_CMP_PKIFAILUREINFO_unsupportedVersion 22
+#define OSSL_CMP_PKIFAILUREINFO_notAuthorized 23
+#define OSSL_CMP_PKIFAILUREINFO_systemUnavail 24
+#define OSSL_CMP_PKIFAILUREINFO_systemFailure 25
+#define OSSL_CMP_PKIFAILUREINFO_duplicateCertReq 26
+#define OSSL_CMP_PKIFAILUREINFO_MAX 26
+#define OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN \
     ((1 << (OSSL_CMP_PKIFAILUREINFO_MAX + 1)) - 1)
-#  if OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN > INT_MAX
-#   error CMP_PKIFAILUREINFO_MAX bit pattern does not fit in type int
-#  endif
+#if OSSL_CMP_PKIFAILUREINFO_MAX_BIT_PATTERN > INT_MAX
+#error CMP_PKIFAILUREINFO_MAX bit pattern does not fit in type int
+#endif
 typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
 
-#  define OSSL_CMP_CTX_FAILINFO_badAlg (1 << 0)
-#  define OSSL_CMP_CTX_FAILINFO_badMessageCheck (1 << 1)
-#  define OSSL_CMP_CTX_FAILINFO_badRequest (1 << 2)
-#  define OSSL_CMP_CTX_FAILINFO_badTime (1 << 3)
-#  define OSSL_CMP_CTX_FAILINFO_badCertId (1 << 4)
-#  define OSSL_CMP_CTX_FAILINFO_badDataFormat (1 << 5)
-#  define OSSL_CMP_CTX_FAILINFO_wrongAuthority (1 << 6)
-#  define OSSL_CMP_CTX_FAILINFO_incorrectData (1 << 7)
-#  define OSSL_CMP_CTX_FAILINFO_missingTimeStamp (1 << 8)
-#  define OSSL_CMP_CTX_FAILINFO_badPOP (1 << 9)
-#  define OSSL_CMP_CTX_FAILINFO_certRevoked (1 << 10)
-#  define OSSL_CMP_CTX_FAILINFO_certConfirmed (1 << 11)
-#  define OSSL_CMP_CTX_FAILINFO_wrongIntegrity (1 << 12)
-#  define OSSL_CMP_CTX_FAILINFO_badRecipientNonce (1 << 13)
-#  define OSSL_CMP_CTX_FAILINFO_timeNotAvailable (1 << 14)
-#  define OSSL_CMP_CTX_FAILINFO_unacceptedPolicy (1 << 15)
-#  define OSSL_CMP_CTX_FAILINFO_unacceptedExtension (1 << 16)
-#  define OSSL_CMP_CTX_FAILINFO_addInfoNotAvailable (1 << 17)
-#  define OSSL_CMP_CTX_FAILINFO_badSenderNonce (1 << 18)
-#  define OSSL_CMP_CTX_FAILINFO_badCertTemplate (1 << 19)
-#  define OSSL_CMP_CTX_FAILINFO_signerNotTrusted (1 << 20)
-#  define OSSL_CMP_CTX_FAILINFO_transactionIdInUse (1 << 21)
-#  define OSSL_CMP_CTX_FAILINFO_unsupportedVersion (1 << 22)
-#  define OSSL_CMP_CTX_FAILINFO_notAuthorized (1 << 23)
-#  define OSSL_CMP_CTX_FAILINFO_systemUnavail (1 << 24)
-#  define OSSL_CMP_CTX_FAILINFO_systemFailure (1 << 25)
-#  define OSSL_CMP_CTX_FAILINFO_duplicateCertReq (1 << 26)
+#define OSSL_CMP_CTX_FAILINFO_badAlg (1 << 0)
+#define OSSL_CMP_CTX_FAILINFO_badMessageCheck (1 << 1)
+#define OSSL_CMP_CTX_FAILINFO_badRequest (1 << 2)
+#define OSSL_CMP_CTX_FAILINFO_badTime (1 << 3)
+#define OSSL_CMP_CTX_FAILINFO_badCertId (1 << 4)
+#define OSSL_CMP_CTX_FAILINFO_badDataFormat (1 << 5)
+#define OSSL_CMP_CTX_FAILINFO_wrongAuthority (1 << 6)
+#define OSSL_CMP_CTX_FAILINFO_incorrectData (1 << 7)
+#define OSSL_CMP_CTX_FAILINFO_missingTimeStamp (1 << 8)
+#define OSSL_CMP_CTX_FAILINFO_badPOP (1 << 9)
+#define OSSL_CMP_CTX_FAILINFO_certRevoked (1 << 10)
+#define OSSL_CMP_CTX_FAILINFO_certConfirmed (1 << 11)
+#define OSSL_CMP_CTX_FAILINFO_wrongIntegrity (1 << 12)
+#define OSSL_CMP_CTX_FAILINFO_badRecipientNonce (1 << 13)
+#define OSSL_CMP_CTX_FAILINFO_timeNotAvailable (1 << 14)
+#define OSSL_CMP_CTX_FAILINFO_unacceptedPolicy (1 << 15)
+#define OSSL_CMP_CTX_FAILINFO_unacceptedExtension (1 << 16)
+#define OSSL_CMP_CTX_FAILINFO_addInfoNotAvailable (1 << 17)
+#define OSSL_CMP_CTX_FAILINFO_badSenderNonce (1 << 18)
+#define OSSL_CMP_CTX_FAILINFO_badCertTemplate (1 << 19)
+#define OSSL_CMP_CTX_FAILINFO_signerNotTrusted (1 << 20)
+#define OSSL_CMP_CTX_FAILINFO_transactionIdInUse (1 << 21)
+#define OSSL_CMP_CTX_FAILINFO_unsupportedVersion (1 << 22)
+#define OSSL_CMP_CTX_FAILINFO_notAuthorized (1 << 23)
+#define OSSL_CMP_CTX_FAILINFO_systemUnavail (1 << 24)
+#define OSSL_CMP_CTX_FAILINFO_systemFailure (1 << 25)
+#define OSSL_CMP_CTX_FAILINFO_duplicateCertReq (1 << 26)
 
 /*-
  *   PKIStatus ::= INTEGER {
@@ -195,22 +197,22 @@ typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
  *       -- CertReqMsg
  *   }
  */
-#  define OSSL_CMP_PKISTATUS_request                -3
-#  define OSSL_CMP_PKISTATUS_trans                  -2
-#  define OSSL_CMP_PKISTATUS_unspecified            -1
-#  define OSSL_CMP_PKISTATUS_accepted               0
-#  define OSSL_CMP_PKISTATUS_grantedWithMods        1
-#  define OSSL_CMP_PKISTATUS_rejection              2
-#  define OSSL_CMP_PKISTATUS_waiting                3
-#  define OSSL_CMP_PKISTATUS_revocationWarning      4
-#  define OSSL_CMP_PKISTATUS_revocationNotification 5
-#  define OSSL_CMP_PKISTATUS_keyUpdateWarning       6
+#define OSSL_CMP_PKISTATUS_request -3
+#define OSSL_CMP_PKISTATUS_trans -2
+#define OSSL_CMP_PKISTATUS_unspecified -1
+#define OSSL_CMP_PKISTATUS_accepted 0
+#define OSSL_CMP_PKISTATUS_grantedWithMods 1
+#define OSSL_CMP_PKISTATUS_rejection 2
+#define OSSL_CMP_PKISTATUS_waiting 3
+#define OSSL_CMP_PKISTATUS_revocationWarning 4
+#define OSSL_CMP_PKISTATUS_revocationNotification 5
+#define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
 typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
 
 DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
 
-#  define OSSL_CMP_CERTORENCCERT_CERTIFICATE 0
-#  define OSSL_CMP_CERTORENCCERT_ENCRYPTEDCERT 1
+#define OSSL_CMP_CERTORENCCERT_CERTIFICATE 0
+#define OSSL_CMP_CERTORENCCERT_ENCRYPTEDCERT 1
 
 /* data type declarations */
 typedef struct ossl_cmp_ctx_st OSSL_CMP_CTX;
@@ -220,47 +222,59 @@ typedef struct ossl_cmp_msg_st OSSL_CMP_MSG;
 DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_MSG)
 DECLARE_ASN1_ENCODE_FUNCTIONS(OSSL_CMP_MSG, OSSL_CMP_MSG, OSSL_CMP_MSG)
 typedef struct ossl_cmp_certstatus_st OSSL_CMP_CERTSTATUS;
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CMP_CERTSTATUS");
 -}
+/* clang-format on */
 typedef struct ossl_cmp_itav_st OSSL_CMP_ITAV;
 DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_ITAV)
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CMP_ITAV");
 -}
+/* clang-format on */
 
 typedef struct ossl_cmp_crlstatus_st OSSL_CMP_CRLSTATUS;
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CMP_CRLSTATUS");
 -}
+/* clang-format on */
 
 typedef OSSL_CRMF_ATTRIBUTETYPEANDVALUE OSSL_CMP_ATAV;
-#  define OSSL_CMP_ATAV_free OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free
+#define OSSL_CMP_ATAV_free OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free
 typedef STACK_OF(OSSL_CRMF_ATTRIBUTETYPEANDVALUE) OSSL_CMP_ATAVS;
 DECLARE_ASN1_FUNCTIONS(OSSL_CMP_ATAVS)
-#  define stack_st_OSSL_CMP_ATAV stack_st_OSSL_CRMF_ATTRIBUTETYPEANDVALUE
-#  define sk_OSSL_CMP_ATAV_num sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_num
-#  define sk_OSSL_CMP_ATAV_value sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_value
-#  define sk_OSSL_CMP_ATAV_push sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_push
-#  define sk_OSSL_CMP_ATAV_pop_free sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_pop_free
+#define stack_st_OSSL_CMP_ATAV stack_st_OSSL_CRMF_ATTRIBUTETYPEANDVALUE
+#define sk_OSSL_CMP_ATAV_num sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_num
+#define sk_OSSL_CMP_ATAV_value sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_value
+#define sk_OSSL_CMP_ATAV_push sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_push
+#define sk_OSSL_CMP_ATAV_pop_free sk_OSSL_CRMF_ATTRIBUTETYPEANDVALUE_pop_free
 
 typedef struct ossl_cmp_revrepcontent_st OSSL_CMP_REVREPCONTENT;
 typedef struct ossl_cmp_pkisi_st OSSL_CMP_PKISI;
 DECLARE_ASN1_FUNCTIONS(OSSL_CMP_PKISI)
 DECLARE_ASN1_DUP_FUNCTION(OSSL_CMP_PKISI)
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CMP_PKISI");
 -}
+/* clang-format on */
 typedef struct ossl_cmp_certrepmessage_st OSSL_CMP_CERTREPMESSAGE;
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CMP_CERTREPMESSAGE");
 -}
+/* clang-format on */
 typedef struct ossl_cmp_pollrep_st OSSL_CMP_POLLREP;
 typedef STACK_OF(OSSL_CMP_POLLREP) OSSL_CMP_POLLREPCONTENT;
 typedef struct ossl_cmp_certresponse_st OSSL_CMP_CERTRESPONSE;
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CMP_CERTRESPONSE");
 -}
+/* clang-format on */
 typedef STACK_OF(ASN1_UTF8STRING) OSSL_CMP_PKIFREETEXT;
 
 /*
@@ -270,55 +284,55 @@ typedef STACK_OF(ASN1_UTF8STRING) OSSL_CMP_PKIFREETEXT;
 /* from cmp_asn.c */
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_create(ASN1_OBJECT *type, ASN1_TYPE *value);
 void OSSL_CMP_ITAV_set0(OSSL_CMP_ITAV *itav, ASN1_OBJECT *type,
-                        ASN1_TYPE *value);
+    ASN1_TYPE *value);
 ASN1_OBJECT *OSSL_CMP_ITAV_get0_type(const OSSL_CMP_ITAV *itav);
 ASN1_TYPE *OSSL_CMP_ITAV_get0_value(const OSSL_CMP_ITAV *itav);
 int OSSL_CMP_ITAV_push0_stack_item(STACK_OF(OSSL_CMP_ITAV) **sk_p,
-                                   OSSL_CMP_ITAV *itav);
+    OSSL_CMP_ITAV *itav);
 void OSSL_CMP_ITAV_free(OSSL_CMP_ITAV *itav);
 
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new0_certProfile(STACK_OF(ASN1_UTF8STRING)
-                                              *certProfile);
+        *certProfile);
 int OSSL_CMP_ITAV_get0_certProfile(const OSSL_CMP_ITAV *itav,
-                                   STACK_OF(ASN1_UTF8STRING) **out);
+    STACK_OF(ASN1_UTF8STRING) **out);
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_caCerts(const STACK_OF(X509) *caCerts);
 int OSSL_CMP_ITAV_get0_caCerts(const OSSL_CMP_ITAV *itav, STACK_OF(X509) **out);
 
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaCert(const X509 *rootCaCert);
 int OSSL_CMP_ITAV_get0_rootCaCert(const OSSL_CMP_ITAV *itav, X509 **out);
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_rootCaKeyUpdate(const X509 *newWithNew,
-                                                 const X509 *newWithOld,
-                                                 const X509 *oldWithNew);
+    const X509 *newWithOld,
+    const X509 *oldWithNew);
 int OSSL_CMP_ITAV_get0_rootCaKeyUpdate(const OSSL_CMP_ITAV *itav,
-                                       X509 **newWithNew,
-                                       X509 **newWithOld,
-                                       X509 **oldWithNew);
+    X509 **newWithNew,
+    X509 **newWithOld,
+    X509 **oldWithNew);
 
 OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_create(const X509_CRL *crl,
-                                              const X509 *cert, int only_DN);
+    const X509 *cert, int only_DN);
 OSSL_CMP_CRLSTATUS *OSSL_CMP_CRLSTATUS_new1(const DIST_POINT_NAME *dpn,
-                                            const GENERAL_NAMES *issuer,
-                                            const ASN1_TIME *thisUpdate);
+    const GENERAL_NAMES *issuer,
+    const ASN1_TIME *thisUpdate);
 int OSSL_CMP_CRLSTATUS_get0(const OSSL_CMP_CRLSTATUS *crlstatus,
-                            DIST_POINT_NAME **dpn, GENERAL_NAMES **issuer,
-                            ASN1_TIME **thisUpdate);
+    DIST_POINT_NAME **dpn, GENERAL_NAMES **issuer,
+    ASN1_TIME **thisUpdate);
 void OSSL_CMP_CRLSTATUS_free(OSSL_CMP_CRLSTATUS *crlstatus);
 OSSL_CMP_ITAV
 *OSSL_CMP_ITAV_new0_crlStatusList(STACK_OF(OSSL_CMP_CRLSTATUS) *crlStatusList);
 int OSSL_CMP_ITAV_get0_crlStatusList(const OSSL_CMP_ITAV *itav,
-                                     STACK_OF(OSSL_CMP_CRLSTATUS) **out);
+    STACK_OF(OSSL_CMP_CRLSTATUS) **out);
 OSSL_CMP_ITAV *OSSL_CMP_ITAV_new_crls(const X509_CRL *crls);
 int OSSL_CMP_ITAV_get0_crls(const OSSL_CMP_ITAV *it, STACK_OF(X509_CRL) **out);
 OSSL_CMP_ITAV
 *OSSL_CMP_ITAV_new0_certReqTemplate(OSSL_CRMF_CERTTEMPLATE *certTemplate,
-                                    OSSL_CMP_ATAVS *keySpec);
+    OSSL_CMP_ATAVS *keySpec);
 int OSSL_CMP_ITAV_get1_certReqTemplate(const OSSL_CMP_ITAV *itav,
-                                       OSSL_CRMF_CERTTEMPLATE **certTemplate,
-                                       OSSL_CMP_ATAVS **keySpec);
+    OSSL_CRMF_CERTTEMPLATE **certTemplate,
+    OSSL_CMP_ATAVS **keySpec);
 
 OSSL_CMP_ATAV *OSSL_CMP_ATAV_create(ASN1_OBJECT *type, ASN1_TYPE *value);
 void OSSL_CMP_ATAV_set0(OSSL_CMP_ATAV *itav, ASN1_OBJECT *type,
-                        ASN1_TYPE *value);
+    ASN1_TYPE *value);
 ASN1_OBJECT *OSSL_CMP_ATAV_get0_type(const OSSL_CMP_ATAV *itav);
 ASN1_TYPE *OSSL_CMP_ATAV_get0_value(const OSSL_CMP_ATAV *itav);
 OSSL_CMP_ATAV *OSSL_CMP_ATAV_new_algId(const X509_ALGOR *alg);
@@ -336,35 +350,35 @@ int OSSL_CMP_CTX_reinit(OSSL_CMP_CTX *ctx);
 OSSL_LIB_CTX *OSSL_CMP_CTX_get0_libctx(const OSSL_CMP_CTX *ctx);
 const char *OSSL_CMP_CTX_get0_propq(const OSSL_CMP_CTX *ctx);
 /* CMP general options: */
-#  define OSSL_CMP_OPT_LOG_VERBOSITY 0
+#define OSSL_CMP_OPT_LOG_VERBOSITY 0
 /* CMP transfer options: */
-#  define OSSL_CMP_OPT_KEEP_ALIVE    10
-#  define OSSL_CMP_OPT_MSG_TIMEOUT   11
-#  define OSSL_CMP_OPT_TOTAL_TIMEOUT 12
-#  define OSSL_CMP_OPT_USE_TLS       13
+#define OSSL_CMP_OPT_KEEP_ALIVE 10
+#define OSSL_CMP_OPT_MSG_TIMEOUT 11
+#define OSSL_CMP_OPT_TOTAL_TIMEOUT 12
+#define OSSL_CMP_OPT_USE_TLS 13
 /* CMP request options: */
-#  define OSSL_CMP_OPT_VALIDITY_DAYS 20
-#  define OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT 21
-#  define OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL 22
-#  define OSSL_CMP_OPT_POLICIES_CRITICAL 23
-#  define OSSL_CMP_OPT_POPO_METHOD 24
-#  define OSSL_CMP_OPT_IMPLICIT_CONFIRM 25
-#  define OSSL_CMP_OPT_DISABLE_CONFIRM 26
-#  define OSSL_CMP_OPT_REVOCATION_REASON 27
+#define OSSL_CMP_OPT_VALIDITY_DAYS 20
+#define OSSL_CMP_OPT_SUBJECTALTNAME_NODEFAULT 21
+#define OSSL_CMP_OPT_SUBJECTALTNAME_CRITICAL 22
+#define OSSL_CMP_OPT_POLICIES_CRITICAL 23
+#define OSSL_CMP_OPT_POPO_METHOD 24
+#define OSSL_CMP_OPT_IMPLICIT_CONFIRM 25
+#define OSSL_CMP_OPT_DISABLE_CONFIRM 26
+#define OSSL_CMP_OPT_REVOCATION_REASON 27
 /* CMP protection options: */
-#  define OSSL_CMP_OPT_UNPROTECTED_SEND 30
-#  define OSSL_CMP_OPT_UNPROTECTED_ERRORS 31
-#  define OSSL_CMP_OPT_OWF_ALGNID 32
-#  define OSSL_CMP_OPT_MAC_ALGNID 33
-#  define OSSL_CMP_OPT_DIGEST_ALGNID 34
-#  define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
-#  define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
-#  define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
+#define OSSL_CMP_OPT_UNPROTECTED_SEND 30
+#define OSSL_CMP_OPT_UNPROTECTED_ERRORS 31
+#define OSSL_CMP_OPT_OWF_ALGNID 32
+#define OSSL_CMP_OPT_MAC_ALGNID 33
+#define OSSL_CMP_OPT_DIGEST_ALGNID 34
+#define OSSL_CMP_OPT_IGNORE_KEYUSAGE 35
+#define OSSL_CMP_OPT_PERMIT_TA_IN_EXTRACERTS_FOR_IR 36
+#define OSSL_CMP_OPT_NO_CACHE_EXTRACERTS 37
 int OSSL_CMP_CTX_set_option(OSSL_CMP_CTX *ctx, int opt, int val);
 int OSSL_CMP_CTX_get_option(const OSSL_CMP_CTX *ctx, int opt);
 /* CMP-specific callback for logging and outputting the error queue: */
 int OSSL_CMP_CTX_set_log_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_log_cb_t cb);
-#  define OSSL_CMP_CTX_set_log_verbosity(ctx, level) \
+#define OSSL_CMP_CTX_set_log_verbosity(ctx, level) \
     OSSL_CMP_CTX_set_option(ctx, OSSL_CMP_OPT_LOG_VERBOSITY, level)
 void OSSL_CMP_CTX_print_errors(const OSSL_CMP_CTX *ctx);
 /* message transfer: */
@@ -373,13 +387,13 @@ int OSSL_CMP_CTX_set1_server(OSSL_CMP_CTX *ctx, const char *address);
 int OSSL_CMP_CTX_set_serverPort(OSSL_CMP_CTX *ctx, int port);
 int OSSL_CMP_CTX_set1_proxy(OSSL_CMP_CTX *ctx, const char *name);
 int OSSL_CMP_CTX_set1_no_proxy(OSSL_CMP_CTX *ctx, const char *names);
-#   ifndef OPENSSL_NO_HTTP
+#ifndef OPENSSL_NO_HTTP
 int OSSL_CMP_CTX_set_http_cb(OSSL_CMP_CTX *ctx, OSSL_HTTP_bio_cb_t cb);
 int OSSL_CMP_CTX_set_http_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
 void *OSSL_CMP_CTX_get_http_cb_arg(const OSSL_CMP_CTX *ctx);
-#   endif
-typedef OSSL_CMP_MSG *(*OSSL_CMP_transfer_cb_t) (OSSL_CMP_CTX *ctx,
-                                                 const OSSL_CMP_MSG *req);
+#endif
+typedef OSSL_CMP_MSG *(*OSSL_CMP_transfer_cb_t)(OSSL_CMP_CTX *ctx,
+    const OSSL_CMP_MSG *req);
 int OSSL_CMP_CTX_set_transfer_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_transfer_cb_t cb);
 int OSSL_CMP_CTX_set_transfer_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
 void *OSSL_CMP_CTX_get_transfer_cb_arg(const OSSL_CMP_CTX *ctx);
@@ -387,28 +401,28 @@ void *OSSL_CMP_CTX_get_transfer_cb_arg(const OSSL_CMP_CTX *ctx);
 int OSSL_CMP_CTX_set1_srvCert(OSSL_CMP_CTX *ctx, X509 *cert);
 int OSSL_CMP_CTX_set1_expected_sender(OSSL_CMP_CTX *ctx, const X509_NAME *name);
 int OSSL_CMP_CTX_set0_trustedStore(OSSL_CMP_CTX *ctx, X509_STORE *store);
-#  define OSSL_CMP_CTX_set0_trusted OSSL_CMP_CTX_set0_trustedStore
+#define OSSL_CMP_CTX_set0_trusted OSSL_CMP_CTX_set0_trustedStore
 X509_STORE *OSSL_CMP_CTX_get0_trustedStore(const OSSL_CMP_CTX *ctx);
-#  define OSSL_CMP_CTX_get0_trusted OSSL_CMP_CTX_get0_trustedStore
+#define OSSL_CMP_CTX_get0_trusted OSSL_CMP_CTX_get0_trustedStore
 int OSSL_CMP_CTX_set1_untrusted(OSSL_CMP_CTX *ctx, STACK_OF(X509) *certs);
 STACK_OF(X509) *OSSL_CMP_CTX_get0_untrusted(const OSSL_CMP_CTX *ctx);
 /* client authentication: */
 int OSSL_CMP_CTX_set1_cert(OSSL_CMP_CTX *ctx, X509 *cert);
 int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
-                                  STACK_OF(X509) *candidates);
+    STACK_OF(X509) *candidates);
 int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
 int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
-                                     const unsigned char *ref, int len);
+    const unsigned char *ref, int len);
 int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
-                                  const unsigned char *sec, int len);
+    const unsigned char *sec, int len);
 /* CMP message header and extra certificates: */
 int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
 int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
 int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
 STACK_OF(OSSL_CMP_ITAV)
-    *OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
+*OSSL_CMP_CTX_get0_geninfo_ITAVs(const OSSL_CMP_CTX *ctx);
 int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
-                                    STACK_OF(X509) *extraCertsOut);
+    STACK_OF(X509) *extraCertsOut);
 /* certificate template: */
 int OSSL_CMP_CTX_set0_newPkey(OSSL_CMP_CTX *ctx, int priv, EVP_PKEY *pkey);
 EVP_PKEY *OSSL_CMP_CTX_get0_newPkey(const OSSL_CMP_CTX *ctx, int priv);
@@ -416,7 +430,7 @@ int OSSL_CMP_CTX_set1_issuer(OSSL_CMP_CTX *ctx, const X509_NAME *name);
 int OSSL_CMP_CTX_set1_serialNumber(OSSL_CMP_CTX *ctx, const ASN1_INTEGER *sn);
 int OSSL_CMP_CTX_set1_subjectName(OSSL_CMP_CTX *ctx, const X509_NAME *name);
 int OSSL_CMP_CTX_push1_subjectAltName(OSSL_CMP_CTX *ctx,
-                                      const GENERAL_NAME *name);
+    const GENERAL_NAME *name);
 int OSSL_CMP_CTX_set0_reqExtensions(OSSL_CMP_CTX *ctx, X509_EXTENSIONS *exts);
 int OSSL_CMP_CTX_reqExtensions_have_SAN(OSSL_CMP_CTX *ctx);
 int OSSL_CMP_CTX_push0_policy(OSSL_CMP_CTX *ctx, POLICYINFO *pinfo);
@@ -425,10 +439,10 @@ int OSSL_CMP_CTX_set1_p10CSR(OSSL_CMP_CTX *ctx, const X509_REQ *csr);
 /* misc body contents: */
 int OSSL_CMP_CTX_push0_genm_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
 /* certificate confirmation: */
-typedef int (*OSSL_CMP_certConf_cb_t) (OSSL_CMP_CTX *ctx, X509 *cert,
-                                       int fail_info, const char **txt);
+typedef int (*OSSL_CMP_certConf_cb_t)(OSSL_CMP_CTX *ctx, X509 *cert,
+    int fail_info, const char **txt);
 int OSSL_CMP_certConf_cb(OSSL_CMP_CTX *ctx, X509 *cert, int fail_info,
-                         const char **text);
+    const char **text);
 int OSSL_CMP_CTX_set_certConf_cb(OSSL_CMP_CTX *ctx, OSSL_CMP_certConf_cb_t cb);
 int OSSL_CMP_CTX_set_certConf_cb_arg(OSSL_CMP_CTX *ctx, void *arg);
 void *OSSL_CMP_CTX_get_certConf_cb_arg(const OSSL_CMP_CTX *ctx);
@@ -436,31 +450,30 @@ void *OSSL_CMP_CTX_get_certConf_cb_arg(const OSSL_CMP_CTX *ctx);
 int OSSL_CMP_CTX_get_status(const OSSL_CMP_CTX *ctx);
 OSSL_CMP_PKIFREETEXT *OSSL_CMP_CTX_get0_statusString(const OSSL_CMP_CTX *ctx);
 int OSSL_CMP_CTX_get_failInfoCode(const OSSL_CMP_CTX *ctx);
-#  define OSSL_CMP_PKISI_BUFLEN 1024
+#define OSSL_CMP_PKISI_BUFLEN 1024
 X509 *OSSL_CMP_CTX_get0_validatedSrvCert(const OSSL_CMP_CTX *ctx);
 X509 *OSSL_CMP_CTX_get0_newCert(const OSSL_CMP_CTX *ctx);
 STACK_OF(X509) *OSSL_CMP_CTX_get1_newChain(const OSSL_CMP_CTX *ctx);
 STACK_OF(X509) *OSSL_CMP_CTX_get1_caPubs(const OSSL_CMP_CTX *ctx);
 STACK_OF(X509) *OSSL_CMP_CTX_get1_extraCertsIn(const OSSL_CMP_CTX *ctx);
 int OSSL_CMP_CTX_set1_transactionID(OSSL_CMP_CTX *ctx,
-                                    const ASN1_OCTET_STRING *id);
+    const ASN1_OCTET_STRING *id);
 int OSSL_CMP_CTX_set1_senderNonce(OSSL_CMP_CTX *ctx,
-                                  const ASN1_OCTET_STRING *nonce);
+    const ASN1_OCTET_STRING *nonce);
 
 /* from cmp_status.c */
 char *OSSL_CMP_CTX_snprint_PKIStatus(const OSSL_CMP_CTX *ctx, char *buf,
-                                     size_t bufsize);
+    size_t bufsize);
 char *OSSL_CMP_snprint_PKIStatusInfo(const OSSL_CMP_PKISI *statusInfo,
-                                     char *buf, size_t bufsize);
+    char *buf, size_t bufsize);
 OSSL_CMP_PKISI *
 OSSL_CMP_STATUSINFO_new(int status, int fail_info, const char *text);
 
 /* from cmp_hdr.c */
-ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const
-                                                   OSSL_CMP_PKIHEADER *hdr);
+ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_transactionID(const OSSL_CMP_PKIHEADER *hdr);
 ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
 STACK_OF(OSSL_CMP_ITAV)
-    *OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
+*OSSL_CMP_HDR_get0_geninfo_ITAVs(const OSSL_CMP_PKIHEADER *hdr);
 
 /* from cmp_msg.c */
 OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
@@ -470,7 +483,7 @@ int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
 int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
 OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
 OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
-                                const char *propq);
+    const char *propq);
 int OSSL_CMP_MSG_write(const char *file, const OSSL_CMP_MSG *msg);
 OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg);
 int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg);
@@ -478,107 +491,106 @@ int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg);
 /* from cmp_vfy.c */
 int OSSL_CMP_validate_msg(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *msg);
 int OSSL_CMP_validate_cert_path(const OSSL_CMP_CTX *ctx,
-                                X509_STORE *trusted_store, X509 *cert);
+    X509_STORE *trusted_store, X509 *cert);
 
 /* from cmp_http.c */
-#   ifndef OPENSSL_NO_HTTP
+#ifndef OPENSSL_NO_HTTP
 OSSL_CMP_MSG *OSSL_CMP_MSG_http_perform(OSSL_CMP_CTX *ctx,
-                                        const OSSL_CMP_MSG *req);
-#   endif
+    const OSSL_CMP_MSG *req);
+#endif
 
 /* from cmp_server.c */
 typedef struct ossl_cmp_srv_ctx_st OSSL_CMP_SRV_CTX;
 OSSL_CMP_MSG *OSSL_CMP_SRV_process_request(OSSL_CMP_SRV_CTX *srv_ctx,
-                                           const OSSL_CMP_MSG *req);
-OSSL_CMP_MSG * OSSL_CMP_CTX_server_perform(OSSL_CMP_CTX *client_ctx,
-                                           const OSSL_CMP_MSG *req);
+    const OSSL_CMP_MSG *req);
+OSSL_CMP_MSG *OSSL_CMP_CTX_server_perform(OSSL_CMP_CTX *client_ctx,
+    const OSSL_CMP_MSG *req);
 OSSL_CMP_SRV_CTX *OSSL_CMP_SRV_CTX_new(OSSL_LIB_CTX *libctx, const char *propq);
 void OSSL_CMP_SRV_CTX_free(OSSL_CMP_SRV_CTX *srv_ctx);
-typedef OSSL_CMP_PKISI *(*OSSL_CMP_SRV_cert_request_cb_t)
-    (OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *req, int certReqId,
-     const OSSL_CRMF_MSG *crm, const X509_REQ *p10cr,
-     X509 **certOut, STACK_OF(X509) **chainOut, STACK_OF(X509) **caPubs);
+typedef OSSL_CMP_PKISI *(*OSSL_CMP_SRV_cert_request_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx, const OSSL_CMP_MSG *req, int certReqId,
+    const OSSL_CRMF_MSG *crm, const X509_REQ *p10cr,
+    X509 **certOut, STACK_OF(X509) **chainOut, STACK_OF(X509) **caPubs);
 typedef OSSL_CMP_PKISI *(*OSSL_CMP_SRV_rr_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                const OSSL_CMP_MSG *req,
-                                                const X509_NAME *issuer,
-                                                const ASN1_INTEGER *serial);
+    const OSSL_CMP_MSG *req,
+    const X509_NAME *issuer,
+    const ASN1_INTEGER *serial);
 typedef int (*OSSL_CMP_SRV_genm_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                      const OSSL_CMP_MSG *req,
-                                      const STACK_OF(OSSL_CMP_ITAV) *in,
-                                      STACK_OF(OSSL_CMP_ITAV) **out);
+    const OSSL_CMP_MSG *req,
+    const STACK_OF(OSSL_CMP_ITAV) *in,
+    STACK_OF(OSSL_CMP_ITAV) **out);
 typedef void (*OSSL_CMP_SRV_error_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                        const OSSL_CMP_MSG *req,
-                                        const OSSL_CMP_PKISI *statusInfo,
-                                        const ASN1_INTEGER *errorCode,
-                                        const OSSL_CMP_PKIFREETEXT *errDetails);
+    const OSSL_CMP_MSG *req,
+    const OSSL_CMP_PKISI *statusInfo,
+    const ASN1_INTEGER *errorCode,
+    const OSSL_CMP_PKIFREETEXT *errDetails);
 typedef int (*OSSL_CMP_SRV_certConf_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                          const OSSL_CMP_MSG *req,
-                                          int certReqId,
-                                          const ASN1_OCTET_STRING *certHash,
-                                          const OSSL_CMP_PKISI *si);
+    const OSSL_CMP_MSG *req,
+    int certReqId,
+    const ASN1_OCTET_STRING *certHash,
+    const OSSL_CMP_PKISI *si);
 typedef int (*OSSL_CMP_SRV_pollReq_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                         const OSSL_CMP_MSG *req, int certReqId,
-                                         OSSL_CMP_MSG **certReq,
-                                         int64_t *check_after);
+    const OSSL_CMP_MSG *req, int certReqId,
+    OSSL_CMP_MSG **certReq,
+    int64_t *check_after);
 int OSSL_CMP_SRV_CTX_init(OSSL_CMP_SRV_CTX *srv_ctx, void *custom_ctx,
-                          OSSL_CMP_SRV_cert_request_cb_t process_cert_request,
-                          OSSL_CMP_SRV_rr_cb_t process_rr,
-                          OSSL_CMP_SRV_genm_cb_t process_genm,
-                          OSSL_CMP_SRV_error_cb_t process_error,
-                          OSSL_CMP_SRV_certConf_cb_t process_certConf,
-                          OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
+    OSSL_CMP_SRV_cert_request_cb_t process_cert_request,
+    OSSL_CMP_SRV_rr_cb_t process_rr,
+    OSSL_CMP_SRV_genm_cb_t process_genm,
+    OSSL_CMP_SRV_error_cb_t process_error,
+    OSSL_CMP_SRV_certConf_cb_t process_certConf,
+    OSSL_CMP_SRV_pollReq_cb_t process_pollReq);
 typedef int (*OSSL_CMP_SRV_delayed_delivery_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                  const OSSL_CMP_MSG *req);
+    const OSSL_CMP_MSG *req);
 typedef int (*OSSL_CMP_SRV_clean_transaction_cb_t)(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                   const ASN1_OCTET_STRING *id);
+    const ASN1_OCTET_STRING *id);
 int OSSL_CMP_SRV_CTX_init_trans(OSSL_CMP_SRV_CTX *srv_ctx,
-                                OSSL_CMP_SRV_delayed_delivery_cb_t delay,
-                                OSSL_CMP_SRV_clean_transaction_cb_t clean);
+    OSSL_CMP_SRV_delayed_delivery_cb_t delay,
+    OSSL_CMP_SRV_clean_transaction_cb_t clean);
 OSSL_CMP_CTX *OSSL_CMP_SRV_CTX_get0_cmp_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
 void *OSSL_CMP_SRV_CTX_get0_custom_ctx(const OSSL_CMP_SRV_CTX *srv_ctx);
 int OSSL_CMP_SRV_CTX_set_send_unprotected_errors(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                 int val);
+    int val);
 int OSSL_CMP_SRV_CTX_set_accept_unprotected(OSSL_CMP_SRV_CTX *srv_ctx, int val);
 int OSSL_CMP_SRV_CTX_set_accept_raverified(OSSL_CMP_SRV_CTX *srv_ctx, int val);
 int OSSL_CMP_SRV_CTX_set_grant_implicit_confirm(OSSL_CMP_SRV_CTX *srv_ctx,
-                                                int val);
+    int val);
 
 /* from cmp_client.c */
 X509 *OSSL_CMP_exec_certreq(OSSL_CMP_CTX *ctx, int req_type,
-                            const OSSL_CRMF_MSG *crm);
-#  define OSSL_CMP_IR    0
-#  define OSSL_CMP_CR    2
-#  define OSSL_CMP_P10CR 4
-#  define OSSL_CMP_KUR   7
-#  define OSSL_CMP_GENM  21
-#  define OSSL_CMP_ERROR 23
-#  define OSSL_CMP_exec_IR_ses(ctx) \
+    const OSSL_CRMF_MSG *crm);
+#define OSSL_CMP_IR 0
+#define OSSL_CMP_CR 2
+#define OSSL_CMP_P10CR 4
+#define OSSL_CMP_KUR 7
+#define OSSL_CMP_GENM 21
+#define OSSL_CMP_ERROR 23
+#define OSSL_CMP_exec_IR_ses(ctx) \
     OSSL_CMP_exec_certreq(ctx, OSSL_CMP_IR, NULL)
-#  define OSSL_CMP_exec_CR_ses(ctx) \
+#define OSSL_CMP_exec_CR_ses(ctx) \
     OSSL_CMP_exec_certreq(ctx, OSSL_CMP_CR, NULL)
-#  define OSSL_CMP_exec_P10CR_ses(ctx) \
+#define OSSL_CMP_exec_P10CR_ses(ctx) \
     OSSL_CMP_exec_certreq(ctx, OSSL_CMP_P10CR, NULL)
-#  define OSSL_CMP_exec_KUR_ses(ctx) \
+#define OSSL_CMP_exec_KUR_ses(ctx) \
     OSSL_CMP_exec_certreq(ctx, OSSL_CMP_KUR, NULL)
 int OSSL_CMP_try_certreq(OSSL_CMP_CTX *ctx, int req_type,
-                         const OSSL_CRMF_MSG *crm, int *checkAfter);
+    const OSSL_CRMF_MSG *crm, int *checkAfter);
 int OSSL_CMP_exec_RR_ses(OSSL_CMP_CTX *ctx);
 STACK_OF(OSSL_CMP_ITAV) *OSSL_CMP_exec_GENM_ses(OSSL_CMP_CTX *ctx);
 
 /* from cmp_genm.c */
 int OSSL_CMP_get1_caCerts(OSSL_CMP_CTX *ctx, STACK_OF(X509) **out);
 int OSSL_CMP_get1_rootCaKeyUpdate(OSSL_CMP_CTX *ctx,
-                                  const X509 *oldWithOld, X509 **newWithNew,
-                                  X509 **newWithOld, X509 **oldWithNew);
+    const X509 *oldWithOld, X509 **newWithNew,
+    X509 **newWithOld, X509 **oldWithNew);
 int OSSL_CMP_get1_crlUpdate(OSSL_CMP_CTX *ctx, const X509 *crlcert,
-                            const X509_CRL *last_crl,
-                            X509_CRL **crl);
+    const X509_CRL *last_crl,
+    X509_CRL **crl);
 int OSSL_CMP_get1_certReqTemplate(OSSL_CMP_CTX *ctx,
-                                  OSSL_CRMF_CERTTEMPLATE **certTemplate,
-                                  OSSL_CMP_ATAVS **keySpec);
+    OSSL_CRMF_CERTTEMPLATE **certTemplate,
+    OSSL_CMP_ATAVS **keySpec);
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif /* !defined(OPENSSL_NO_CMP) */
+#endif
+#endif /* !defined(OPENSSL_NO_CMP) */
 #endif /* !defined(OPENSSL_CMP_H) */
diff --git a/include/openssl/cmp_util.h b/include/openssl/cmp_util.h
index 9a168922bfce..a0ee20f473a1 100644
--- a/include/openssl/cmp_util.h
+++ b/include/openssl/cmp_util.h
@@ -10,47 +10,47 @@
  */
 
 #ifndef OPENSSL_CMP_UTIL_H
-# define OPENSSL_CMP_UTIL_H
-# pragma once
+#define OPENSSL_CMP_UTIL_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_CMP
+#include <openssl/opensslconf.h>
+#ifndef OPENSSL_NO_CMP
 
-#  include <openssl/macros.h>
-#  include <openssl/trace.h>
+#include <openssl/macros.h>
+#include <openssl/trace.h>
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-int  OSSL_CMP_log_open(void);
+int OSSL_CMP_log_open(void);
 void OSSL_CMP_log_close(void);
-#  define OSSL_CMP_LOG_PREFIX "CMP "
+#define OSSL_CMP_LOG_PREFIX "CMP "
 
 /*
  * generalized logging/error callback mirroring the severity levels of syslog.h
  */
 typedef int OSSL_CMP_severity;
-#  define OSSL_CMP_LOG_EMERG   0
-#  define OSSL_CMP_LOG_ALERT   1
-#  define OSSL_CMP_LOG_CRIT    2
-#  define OSSL_CMP_LOG_ERR     3
-#  define OSSL_CMP_LOG_WARNING 4
-#  define OSSL_CMP_LOG_NOTICE  5
-#  define OSSL_CMP_LOG_INFO    6
-#  define OSSL_CMP_LOG_DEBUG   7
-#  define OSSL_CMP_LOG_TRACE   8
-#  define OSSL_CMP_LOG_MAX     OSSL_CMP_LOG_TRACE
+#define OSSL_CMP_LOG_EMERG 0
+#define OSSL_CMP_LOG_ALERT 1
+#define OSSL_CMP_LOG_CRIT 2
+#define OSSL_CMP_LOG_ERR 3
+#define OSSL_CMP_LOG_WARNING 4
+#define OSSL_CMP_LOG_NOTICE 5
+#define OSSL_CMP_LOG_INFO 6
+#define OSSL_CMP_LOG_DEBUG 7
+#define OSSL_CMP_LOG_TRACE 8
+#define OSSL_CMP_LOG_MAX OSSL_CMP_LOG_TRACE
 typedef int (*OSSL_CMP_log_cb_t)(const char *func, const char *file, int line,
-                                 OSSL_CMP_severity level, const char *msg);
+    OSSL_CMP_severity level, const char *msg);
 
 int OSSL_CMP_print_to_bio(BIO *bio, const char *component, const char *file,
-                          int line, OSSL_CMP_severity level, const char *msg);
+    int line, OSSL_CMP_severity level, const char *msg);
 /* use of the logging callback for outputting error queue */
 void OSSL_CMP_print_errors_cb(OSSL_CMP_log_cb_t log_fn);
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif /* !defined(OPENSSL_NO_CMP) */
+#endif
+#endif /* !defined(OPENSSL_NO_CMP) */
 #endif /* !defined(OPENSSL_CMP_UTIL_H) */
diff --git a/include/openssl/cmperr.h b/include/openssl/cmperr.h
index 62137aa8d1f5..b07ac6d6c6db 100644
--- a/include/openssl/cmperr.h
+++ b/include/openssl/cmperr.h
@@ -9,126 +9,124 @@
  */
 
 #ifndef OPENSSL_CMPERR_H
-# define OPENSSL_CMPERR_H
-# pragma once
+#define OPENSSL_CMPERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_CMP
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_CMP
 
 /*
  * CMP reason codes.
  */
-#  define CMP_R_ALGORITHM_NOT_SUPPORTED                    139
-#  define CMP_R_BAD_CHECKAFTER_IN_POLLREP                  167
-#  define CMP_R_BAD_REQUEST_ID                             108
-#  define CMP_R_CERTHASH_UNMATCHED                         156
-#  define CMP_R_CERTID_NOT_FOUND                           109
-#  define CMP_R_CERTIFICATE_NOT_ACCEPTED                   169
-#  define CMP_R_CERTIFICATE_NOT_FOUND                      112
-#  define CMP_R_CERTREQMSG_NOT_FOUND                       157
-#  define CMP_R_CERTRESPONSE_NOT_FOUND                     113
-#  define CMP_R_CERT_AND_KEY_DO_NOT_MATCH                  114
-#  define CMP_R_CHECKAFTER_OUT_OF_RANGE                    181
-#  define CMP_R_ENCOUNTERED_KEYUPDATEWARNING               176
-#  define CMP_R_ENCOUNTERED_WAITING                        162
-#  define CMP_R_ERROR_CALCULATING_PROTECTION               115
-#  define CMP_R_ERROR_CREATING_CERTCONF                    116
-#  define CMP_R_ERROR_CREATING_CERTREP                     117
-#  define CMP_R_ERROR_CREATING_CERTREQ                     163
-#  define CMP_R_ERROR_CREATING_ERROR                       118
-#  define CMP_R_ERROR_CREATING_GENM                        119
-#  define CMP_R_ERROR_CREATING_GENP                        120
-#  define CMP_R_ERROR_CREATING_PKICONF                     122
-#  define CMP_R_ERROR_CREATING_POLLREP                     123
-#  define CMP_R_ERROR_CREATING_POLLREQ                     124
-#  define CMP_R_ERROR_CREATING_RP                          125
-#  define CMP_R_ERROR_CREATING_RR                          126
-#  define CMP_R_ERROR_PARSING_PKISTATUS                    107
-#  define CMP_R_ERROR_PROCESSING_MESSAGE                   158
-#  define CMP_R_ERROR_PROTECTING_MESSAGE                   127
-#  define CMP_R_ERROR_SETTING_CERTHASH                     128
-#  define CMP_R_ERROR_UNEXPECTED_CERTCONF                  160
-#  define CMP_R_ERROR_VALIDATING_PROTECTION                140
-#  define CMP_R_ERROR_VALIDATING_SIGNATURE                 171
-#  define CMP_R_EXPECTED_POLLREQ                           104
-#  define CMP_R_FAILED_BUILDING_OWN_CHAIN                  164
-#  define CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY          203
-#  define CMP_R_FAILED_EXTRACTING_PUBKEY                   141
-#  define CMP_R_FAILURE_OBTAINING_RANDOM                   110
-#  define CMP_R_FAIL_INFO_OUT_OF_RANGE                     129
-#  define CMP_R_GENERATE_CERTREQTEMPLATE                   197
-#  define CMP_R_GENERATE_CRLSTATUS                         198
-#  define CMP_R_GETTING_GENP                               192
-#  define CMP_R_GET_ITAV                                   199
-#  define CMP_R_INVALID_ARGS                               100
-#  define CMP_R_INVALID_GENP                               193
-#  define CMP_R_INVALID_KEYSPEC                            202
-#  define CMP_R_INVALID_OPTION                             174
-#  define CMP_R_INVALID_ROOTCAKEYUPDATE                    195
-#  define CMP_R_MISSING_CENTRAL_GEN_KEY                    204
-#  define CMP_R_MISSING_CERTID                             165
-#  define CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION  130
-#  define CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE         142
-#  define CMP_R_MISSING_P10CSR                             121
-#  define CMP_R_MISSING_PBM_SECRET                         166
-#  define CMP_R_MISSING_PRIVATE_KEY                        131
-#  define CMP_R_MISSING_PRIVATE_KEY_FOR_POPO               190
-#  define CMP_R_MISSING_PROTECTION                         143
-#  define CMP_R_MISSING_PUBLIC_KEY                         183
-#  define CMP_R_MISSING_REFERENCE_CERT                     168
-#  define CMP_R_MISSING_SECRET                             178
-#  define CMP_R_MISSING_SENDER_IDENTIFICATION              111
-#  define CMP_R_MISSING_TRUST_ANCHOR                       179
-#  define CMP_R_MISSING_TRUST_STORE                        144
-#  define CMP_R_MULTIPLE_REQUESTS_NOT_SUPPORTED            161
-#  define CMP_R_MULTIPLE_RESPONSES_NOT_SUPPORTED           170
-#  define CMP_R_MULTIPLE_SAN_SOURCES                       102
-#  define CMP_R_NO_STDIO                                   194
-#  define CMP_R_NO_SUITABLE_SENDER_CERT                    145
-#  define CMP_R_NULL_ARGUMENT                              103
-#  define CMP_R_PKIBODY_ERROR                              146
-#  define CMP_R_PKISTATUSINFO_NOT_FOUND                    132
-#  define CMP_R_POLLING_FAILED                             172
-#  define CMP_R_POTENTIALLY_INVALID_CERTIFICATE            147
-#  define CMP_R_RECEIVED_ERROR                             180
-#  define CMP_R_RECIPNONCE_UNMATCHED                       148
-#  define CMP_R_REQUEST_NOT_ACCEPTED                       149
-#  define CMP_R_REQUEST_REJECTED_BY_SERVER                 182
-#  define CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED      150
-#  define CMP_R_SRVCERT_DOES_NOT_VALIDATE_MSG              151
-#  define CMP_R_TOTAL_TIMEOUT                              184
-#  define CMP_R_TRANSACTIONID_UNMATCHED                    152
-#  define CMP_R_TRANSFER_ERROR                             159
-#  define CMP_R_UNCLEAN_CTX                                191
-#  define CMP_R_UNEXPECTED_CENTRAL_GEN_KEY                 205
-#  define CMP_R_UNEXPECTED_CERTPROFILE                     196
-#  define CMP_R_UNEXPECTED_CRLSTATUSLIST                   201
-#  define CMP_R_UNEXPECTED_PKIBODY                         133
-#  define CMP_R_UNEXPECTED_PKISTATUS                       185
-#  define CMP_R_UNEXPECTED_POLLREQ                         105
-#  define CMP_R_UNEXPECTED_PVNO                            153
-#  define CMP_R_UNEXPECTED_SENDER                          106
-#  define CMP_R_UNKNOWN_ALGORITHM_ID                       134
-#  define CMP_R_UNKNOWN_CERT_TYPE                          135
-#  define CMP_R_UNKNOWN_CRL_ISSUER                         200
-#  define CMP_R_UNKNOWN_PKISTATUS                          186
-#  define CMP_R_UNSUPPORTED_ALGORITHM                      136
-#  define CMP_R_UNSUPPORTED_KEY_TYPE                       137
-#  define CMP_R_UNSUPPORTED_PKIBODY                        101
-#  define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC      154
-#  define CMP_R_VALUE_TOO_LARGE                            175
-#  define CMP_R_VALUE_TOO_SMALL                            177
-#  define CMP_R_WRONG_ALGORITHM_OID                        138
-#  define CMP_R_WRONG_CERTID                               189
-#  define CMP_R_WRONG_CERTID_IN_RP                         187
-#  define CMP_R_WRONG_PBM_VALUE                            155
-#  define CMP_R_WRONG_RP_COMPONENT_COUNT                   188
-#  define CMP_R_WRONG_SERIAL_IN_RP                         173
+#define CMP_R_ALGORITHM_NOT_SUPPORTED 139
+#define CMP_R_BAD_CHECKAFTER_IN_POLLREP 167
+#define CMP_R_BAD_REQUEST_ID 108
+#define CMP_R_CERTHASH_UNMATCHED 156
+#define CMP_R_CERTID_NOT_FOUND 109
+#define CMP_R_CERTIFICATE_NOT_ACCEPTED 169
+#define CMP_R_CERTIFICATE_NOT_FOUND 112
+#define CMP_R_CERTREQMSG_NOT_FOUND 157
+#define CMP_R_CERTRESPONSE_NOT_FOUND 113
+#define CMP_R_CERT_AND_KEY_DO_NOT_MATCH 114
+#define CMP_R_CHECKAFTER_OUT_OF_RANGE 181
+#define CMP_R_ENCOUNTERED_KEYUPDATEWARNING 176
+#define CMP_R_ENCOUNTERED_WAITING 162
+#define CMP_R_ERROR_CALCULATING_PROTECTION 115
+#define CMP_R_ERROR_CREATING_CERTCONF 116
+#define CMP_R_ERROR_CREATING_CERTREP 117
+#define CMP_R_ERROR_CREATING_CERTREQ 163
+#define CMP_R_ERROR_CREATING_ERROR 118
+#define CMP_R_ERROR_CREATING_GENM 119
+#define CMP_R_ERROR_CREATING_GENP 120
+#define CMP_R_ERROR_CREATING_PKICONF 122
+#define CMP_R_ERROR_CREATING_POLLREP 123
+#define CMP_R_ERROR_CREATING_POLLREQ 124
+#define CMP_R_ERROR_CREATING_RP 125
+#define CMP_R_ERROR_CREATING_RR 126
+#define CMP_R_ERROR_PARSING_PKISTATUS 107
+#define CMP_R_ERROR_PROCESSING_MESSAGE 158
+#define CMP_R_ERROR_PROTECTING_MESSAGE 127
+#define CMP_R_ERROR_SETTING_CERTHASH 128
+#define CMP_R_ERROR_UNEXPECTED_CERTCONF 160
+#define CMP_R_ERROR_VALIDATING_PROTECTION 140
+#define CMP_R_ERROR_VALIDATING_SIGNATURE 171
+#define CMP_R_EXPECTED_POLLREQ 104
+#define CMP_R_FAILED_BUILDING_OWN_CHAIN 164
+#define CMP_R_FAILED_EXTRACTING_CENTRAL_GEN_KEY 203
+#define CMP_R_FAILED_EXTRACTING_PUBKEY 141
+#define CMP_R_FAILURE_OBTAINING_RANDOM 110
+#define CMP_R_FAIL_INFO_OUT_OF_RANGE 129
+#define CMP_R_GENERATE_CERTREQTEMPLATE 197
+#define CMP_R_GENERATE_CRLSTATUS 198
+#define CMP_R_GETTING_GENP 192
+#define CMP_R_GET_ITAV 199
+#define CMP_R_INVALID_ARGS 100
+#define CMP_R_INVALID_GENP 193
+#define CMP_R_INVALID_KEYSPEC 202
+#define CMP_R_INVALID_OPTION 174
+#define CMP_R_INVALID_ROOTCAKEYUPDATE 195
+#define CMP_R_MISSING_CENTRAL_GEN_KEY 204
+#define CMP_R_MISSING_CERTID 165
+#define CMP_R_MISSING_KEY_INPUT_FOR_CREATING_PROTECTION 130
+#define CMP_R_MISSING_KEY_USAGE_DIGITALSIGNATURE 142
+#define CMP_R_MISSING_P10CSR 121
+#define CMP_R_MISSING_PBM_SECRET 166
+#define CMP_R_MISSING_PRIVATE_KEY 131
+#define CMP_R_MISSING_PRIVATE_KEY_FOR_POPO 190
+#define CMP_R_MISSING_PROTECTION 143
+#define CMP_R_MISSING_PUBLIC_KEY 183
+#define CMP_R_MISSING_REFERENCE_CERT 168
+#define CMP_R_MISSING_SECRET 178
+#define CMP_R_MISSING_SENDER_IDENTIFICATION 111
+#define CMP_R_MISSING_TRUST_ANCHOR 179
+#define CMP_R_MISSING_TRUST_STORE 144
+#define CMP_R_MULTIPLE_REQUESTS_NOT_SUPPORTED 161
+#define CMP_R_MULTIPLE_RESPONSES_NOT_SUPPORTED 170
+#define CMP_R_MULTIPLE_SAN_SOURCES 102
+#define CMP_R_NO_STDIO 194
+#define CMP_R_NO_SUITABLE_SENDER_CERT 145
+#define CMP_R_NULL_ARGUMENT 103
+#define CMP_R_PKIBODY_ERROR 146
+#define CMP_R_PKISTATUSINFO_NOT_FOUND 132
+#define CMP_R_POLLING_FAILED 172
+#define CMP_R_POTENTIALLY_INVALID_CERTIFICATE 147
+#define CMP_R_RECEIVED_ERROR 180
+#define CMP_R_RECIPNONCE_UNMATCHED 148
+#define CMP_R_REQUEST_NOT_ACCEPTED 149
+#define CMP_R_REQUEST_REJECTED_BY_SERVER 182
+#define CMP_R_SENDER_GENERALNAME_TYPE_NOT_SUPPORTED 150
+#define CMP_R_SRVCERT_DOES_NOT_VALIDATE_MSG 151
+#define CMP_R_TOTAL_TIMEOUT 184
+#define CMP_R_TRANSACTIONID_UNMATCHED 152
+#define CMP_R_TRANSFER_ERROR 159
+#define CMP_R_UNCLEAN_CTX 191
+#define CMP_R_UNEXPECTED_CENTRAL_GEN_KEY 205
+#define CMP_R_UNEXPECTED_CERTPROFILE 196
+#define CMP_R_UNEXPECTED_CRLSTATUSLIST 201
+#define CMP_R_UNEXPECTED_PKIBODY 133
+#define CMP_R_UNEXPECTED_PKISTATUS 185
+#define CMP_R_UNEXPECTED_POLLREQ 105
+#define CMP_R_UNEXPECTED_PVNO 153
+#define CMP_R_UNEXPECTED_SENDER 106
+#define CMP_R_UNKNOWN_ALGORITHM_ID 134
+#define CMP_R_UNKNOWN_CERT_TYPE 135
+#define CMP_R_UNKNOWN_CRL_ISSUER 200
+#define CMP_R_UNKNOWN_PKISTATUS 186
+#define CMP_R_UNSUPPORTED_ALGORITHM 136
+#define CMP_R_UNSUPPORTED_KEY_TYPE 137
+#define CMP_R_UNSUPPORTED_PKIBODY 101
+#define CMP_R_UNSUPPORTED_PROTECTION_ALG_DHBASEDMAC 154
+#define CMP_R_VALUE_TOO_LARGE 175
+#define CMP_R_VALUE_TOO_SMALL 177
+#define CMP_R_WRONG_ALGORITHM_OID 138
+#define CMP_R_WRONG_CERTID 189
+#define CMP_R_WRONG_CERTID_IN_RP 187
+#define CMP_R_WRONG_PBM_VALUE 155
+#define CMP_R_WRONG_RP_COMPONENT_COUNT 188
+#define CMP_R_WRONG_SERIAL_IN_RP 173
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/cms.h.in b/include/openssl/cms.h.in
index 0ae75abdfe6f..dc87758514a7 100644
--- a/include/openssl/cms.h.in
+++ b/include/openssl/cms.h.in
@@ -9,28 +9,30 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_CMS_H
-# define OPENSSL_CMS_H
-# pragma once
+#define OPENSSL_CMS_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CMS_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CMS_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_CMS
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-# include <openssl/cmserr.h>
-# ifdef __cplusplus
+#ifndef OPENSSL_NO_CMS
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/cmserr.h>
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 typedef struct CMS_EnvelopedData_st CMS_EnvelopedData;
 typedef struct CMS_ContentInfo_st CMS_ContentInfo;
@@ -44,12 +46,14 @@ typedef struct CMS_Receipt_st CMS_Receipt;
 typedef struct CMS_RecipientEncryptedKey_st CMS_RecipientEncryptedKey;
 typedef struct CMS_OtherKeyAttribute_st CMS_OtherKeyAttribute;
 
+/* clang-format off */
 {-
     generate_stack_macros("CMS_SignerInfo")
     .generate_stack_macros("CMS_RecipientEncryptedKey")
     .generate_stack_macros("CMS_RecipientInfo")
     .generate_stack_macros("CMS_RevocationInfoChoice");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_ITEM(CMS_EnvelopedData)
 DECLARE_ASN1_ALLOC_FUNCTIONS(CMS_SignedData)
@@ -61,44 +65,44 @@ DECLARE_ASN1_DUP_FUNCTION(CMS_EnvelopedData)
 
 CMS_ContentInfo *CMS_ContentInfo_new_ex(OSSL_LIB_CTX *libctx, const char *propq);
 
-# define CMS_SIGNERINFO_ISSUER_SERIAL    0
-# define CMS_SIGNERINFO_KEYIDENTIFIER    1
+#define CMS_SIGNERINFO_ISSUER_SERIAL 0
+#define CMS_SIGNERINFO_KEYIDENTIFIER 1
 
-# define CMS_RECIPINFO_NONE              -1
-# define CMS_RECIPINFO_TRANS             0
-# define CMS_RECIPINFO_AGREE             1
-# define CMS_RECIPINFO_KEK               2
-# define CMS_RECIPINFO_PASS              3
-# define CMS_RECIPINFO_OTHER             4
+#define CMS_RECIPINFO_NONE -1
+#define CMS_RECIPINFO_TRANS 0
+#define CMS_RECIPINFO_AGREE 1
+#define CMS_RECIPINFO_KEK 2
+#define CMS_RECIPINFO_PASS 3
+#define CMS_RECIPINFO_OTHER 4
 
 /* S/MIME related flags */
 
-# define CMS_TEXT                        0x1
-# define CMS_NOCERTS                     0x2
-# define CMS_NO_CONTENT_VERIFY           0x4
-# define CMS_NO_ATTR_VERIFY              0x8
-# define CMS_NOSIGS                      \
-                        (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)
-# define CMS_NOINTERN                    0x10
-# define CMS_NO_SIGNER_CERT_VERIFY       0x20
-# define CMS_NOVERIFY                    0x20
-# define CMS_DETACHED                    0x40
-# define CMS_BINARY                      0x80
-# define CMS_NOATTR                      0x100
-# define CMS_NOSMIMECAP                  0x200
-# define CMS_NOOLDMIMETYPE               0x400
-# define CMS_CRLFEOL                     0x800
-# define CMS_STREAM                      0x1000
-# define CMS_NOCRL                       0x2000
-# define CMS_PARTIAL                     0x4000
-# define CMS_REUSE_DIGEST                0x8000
-# define CMS_USE_KEYID                   0x10000
-# define CMS_DEBUG_DECRYPT               0x20000
-# define CMS_KEY_PARAM                   0x40000
-# define CMS_ASCIICRLF                   0x80000
-# define CMS_CADES                       0x100000
-# define CMS_USE_ORIGINATOR_KEYID        0x200000
-# define CMS_NO_SIGNING_TIME             0x400000
+#define CMS_TEXT 0x1
+#define CMS_NOCERTS 0x2
+#define CMS_NO_CONTENT_VERIFY 0x4
+#define CMS_NO_ATTR_VERIFY 0x8
+#define CMS_NOSIGS \
+    (CMS_NO_CONTENT_VERIFY | CMS_NO_ATTR_VERIFY)
+#define CMS_NOINTERN 0x10
+#define CMS_NO_SIGNER_CERT_VERIFY 0x20
+#define CMS_NOVERIFY 0x20
+#define CMS_DETACHED 0x40
+#define CMS_BINARY 0x80
+#define CMS_NOATTR 0x100
+#define CMS_NOSMIMECAP 0x200
+#define CMS_NOOLDMIMETYPE 0x400
+#define CMS_CRLFEOL 0x800
+#define CMS_STREAM 0x1000
+#define CMS_NOCRL 0x2000
+#define CMS_PARTIAL 0x4000
+#define CMS_REUSE_DIGEST 0x8000
+#define CMS_USE_KEYID 0x10000
+#define CMS_DEBUG_DECRYPT 0x20000
+#define CMS_KEY_PARAM 0x40000
+#define CMS_ASCIICRLF 0x80000
+#define CMS_CADES 0x100000
+#define CMS_USE_ORIGINATOR_KEYID 0x200000
+#define CMS_NO_SIGNING_TIME 0x400000
 
 const ASN1_OBJECT *CMS_get0_type(const CMS_ContentInfo *cms);
 
@@ -109,9 +113,9 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
 int CMS_is_detached(CMS_ContentInfo *cms);
 int CMS_set_detached(CMS_ContentInfo *cms, int detached);
 
-# ifdef OPENSSL_PEM_H
+#ifdef OPENSSL_PEM_H
 DECLARE_PEM_rw(CMS, CMS_ContentInfo)
-# endif
+#endif
 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);
 CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);
 int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
@@ -119,83 +123,83 @@ int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
 BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);
 int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);
 int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,
-                             int flags);
+    int flags);
 CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);
 CMS_ContentInfo *SMIME_read_CMS_ex(BIO *bio, int flags, BIO **bcont, CMS_ContentInfo **ci);
 int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);
 
 int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont,
-              unsigned int flags);
+    unsigned int flags);
 int CMS_final_digest(CMS_ContentInfo *cms,
-                     const unsigned char *md, unsigned int mdlen, BIO *dcont,
-                     unsigned int flags);
+    const unsigned char *md, unsigned int mdlen, BIO *dcont,
+    unsigned int flags);
 
 CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey,
-                          STACK_OF(X509) *certs, BIO *data,
-                          unsigned int flags);
+    STACK_OF(X509) *certs, BIO *data,
+    unsigned int flags);
 CMS_ContentInfo *CMS_sign_ex(X509 *signcert, EVP_PKEY *pkey,
-                             STACK_OF(X509) *certs, BIO *data,
-                             unsigned int flags, OSSL_LIB_CTX *libctx,
-                             const char *propq);
+    STACK_OF(X509) *certs, BIO *data,
+    unsigned int flags, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
-                                  X509 *signcert, EVP_PKEY *pkey,
-                                  STACK_OF(X509) *certs, unsigned int flags);
+    X509 *signcert, EVP_PKEY *pkey,
+    STACK_OF(X509) *certs, unsigned int flags);
 
 int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);
 CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);
 CMS_ContentInfo *CMS_data_create_ex(BIO *in, unsigned int flags,
-                                    OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                      unsigned int flags);
+    unsigned int flags);
 CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
-                                   unsigned int flags);
+    unsigned int flags);
 CMS_ContentInfo *CMS_digest_create_ex(BIO *in, const EVP_MD *md,
-                                      unsigned int flags, OSSL_LIB_CTX *libctx,
-                                      const char *propq);
+    unsigned int flags, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
-                              const unsigned char *key, size_t keylen,
-                              BIO *dcont, BIO *out, unsigned int flags);
+    const unsigned char *key, size_t keylen,
+    BIO *dcont, BIO *out, unsigned int flags);
 CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
-                                           const unsigned char *key,
-                                           size_t keylen, unsigned int flags);
+    const unsigned char *key,
+    size_t keylen, unsigned int flags);
 CMS_ContentInfo *CMS_EncryptedData_encrypt_ex(BIO *in, const EVP_CIPHER *cipher,
-                                              const unsigned char *key,
-                                              size_t keylen, unsigned int flags,
-                                              OSSL_LIB_CTX *libctx,
-                                              const char *propq);
+    const unsigned char *key,
+    size_t keylen, unsigned int flags,
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
-                               const unsigned char *key, size_t keylen);
+    const unsigned char *key, size_t keylen);
 
 int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-               X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
+    X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
 
 int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
-                       STACK_OF(X509) *certs,
-                       X509_STORE *store, unsigned int flags);
+    STACK_OF(X509) *certs,
+    X509_STORE *store, unsigned int flags);
 
 STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);
 
 CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,
-                             const EVP_CIPHER *cipher, unsigned int flags);
+    const EVP_CIPHER *cipher, unsigned int flags);
 CMS_ContentInfo *CMS_encrypt_ex(STACK_OF(X509) *certs, BIO *in,
-                                const EVP_CIPHER *cipher, unsigned int flags,
-                                OSSL_LIB_CTX *libctx, const char *propq);
+    const EVP_CIPHER *cipher, unsigned int flags,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,
-                BIO *dcont, BIO *out, unsigned int flags);
+    BIO *dcont, BIO *out, unsigned int flags);
 
 int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);
 int CMS_decrypt_set1_pkey_and_peer(CMS_ContentInfo *cms, EVP_PKEY *pk,
-                                   X509 *cert, X509 *peer);
+    X509 *cert, X509 *peer);
 int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
-                         unsigned char *key, size_t keylen,
-                         const unsigned char *id, size_t idlen);
+    unsigned char *key, size_t keylen,
+    const unsigned char *id, size_t idlen);
 int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
-                              unsigned char *pass, ossl_ssize_t passlen);
+    unsigned char *pass, ossl_ssize_t passlen);
 
 STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
 int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
@@ -203,66 +207,66 @@ EVP_PKEY_CTX *CMS_RecipientInfo_get0_pkey_ctx(CMS_RecipientInfo *ri);
 CMS_ContentInfo *CMS_AuthEnvelopedData_create(const EVP_CIPHER *cipher);
 CMS_ContentInfo *
 CMS_AuthEnvelopedData_create_ex(const EVP_CIPHER *cipher, OSSL_LIB_CTX *libctx,
-                                const char *propq);
+    const char *propq);
 CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);
 CMS_ContentInfo *CMS_EnvelopedData_create_ex(const EVP_CIPHER *cipher,
-                                             OSSL_LIB_CTX *libctx,
-                                             const char *propq);
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 BIO *CMS_EnvelopedData_decrypt(CMS_EnvelopedData *env, BIO *detached_data,
-                               EVP_PKEY *pkey, X509 *cert,
-                               ASN1_OCTET_STRING *secret, unsigned int flags,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    EVP_PKEY *pkey, X509 *cert,
+    ASN1_OCTET_STRING *secret, unsigned int flags,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
-                                           X509 *recip, unsigned int flags);
+    X509 *recip, unsigned int flags);
 CMS_RecipientInfo *CMS_add1_recipient(CMS_ContentInfo *cms, X509 *recip,
-     EVP_PKEY *originatorPrivKey, X509 * originator, unsigned int flags);
+    EVP_PKEY *originatorPrivKey, X509 *originator, unsigned int flags);
 int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);
 int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);
 int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
-                                     EVP_PKEY **pk, X509 **recip,
-                                     X509_ALGOR **palg);
+    EVP_PKEY **pk, X509 **recip,
+    X509_ALGOR **palg);
 int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
-                                          ASN1_OCTET_STRING **keyid,
-                                          X509_NAME **issuer,
-                                          ASN1_INTEGER **sno);
+    ASN1_OCTET_STRING **keyid,
+    X509_NAME **issuer,
+    ASN1_INTEGER **sno);
 
 CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
-                                          unsigned char *key, size_t keylen,
-                                          unsigned char *id, size_t idlen,
-                                          ASN1_GENERALIZEDTIME *date,
-                                          ASN1_OBJECT *otherTypeId,
-                                          ASN1_TYPE *otherType);
+    unsigned char *key, size_t keylen,
+    unsigned char *id, size_t idlen,
+    ASN1_GENERALIZEDTIME *date,
+    ASN1_OBJECT *otherTypeId,
+    ASN1_TYPE *otherType);
 
 int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pid,
-                                    ASN1_GENERALIZEDTIME **pdate,
-                                    ASN1_OBJECT **potherid,
-                                    ASN1_TYPE **pothertype);
+    X509_ALGOR **palg,
+    ASN1_OCTET_STRING **pid,
+    ASN1_GENERALIZEDTIME **pdate,
+    ASN1_OBJECT **potherid,
+    ASN1_TYPE **pothertype);
 
 int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
-                               unsigned char *key, size_t keylen);
+    unsigned char *key, size_t keylen);
 
 int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
-                                   const unsigned char *id, size_t idlen);
+    const unsigned char *id, size_t idlen);
 
 int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
-                                    unsigned char *pass,
-                                    ossl_ssize_t passlen);
+    unsigned char *pass,
+    ossl_ssize_t passlen);
 
 CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
-                                               int iter, int wrap_nid,
-                                               int pbe_nid,
-                                               unsigned char *pass,
-                                               ossl_ssize_t passlen,
-                                               const EVP_CIPHER *kekciph);
+    int iter, int wrap_nid,
+    int pbe_nid,
+    unsigned char *pass,
+    ossl_ssize_t passlen,
+    const EVP_CIPHER *kekciph);
 
 int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
 int CMS_RecipientInfo_encrypt(const CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
 
 int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                   unsigned int flags);
+    unsigned int flags);
 CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
 
 int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
@@ -280,77 +284,77 @@ STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
 
 int CMS_SignedData_init(CMS_ContentInfo *cms);
 CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
-                                X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
-                                unsigned int flags);
+    X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
+    unsigned int flags);
 EVP_PKEY_CTX *CMS_SignerInfo_get0_pkey_ctx(CMS_SignerInfo *si);
 EVP_MD_CTX *CMS_SignerInfo_get0_md_ctx(CMS_SignerInfo *si);
 STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);
 
 void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);
 int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
-                                  ASN1_OCTET_STRING **keyid,
-                                  X509_NAME **issuer, ASN1_INTEGER **sno);
+    ASN1_OCTET_STRING **keyid,
+    X509_NAME **issuer, ASN1_INTEGER **sno);
 int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);
 int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-                           unsigned int flags);
+    unsigned int flags);
 void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk,
-                              X509 **signer, X509_ALGOR **pdig,
-                              X509_ALGOR **psig);
+    X509 **signer, X509_ALGOR **pdig,
+    X509_ALGOR **psig);
 ASN1_OCTET_STRING *CMS_SignerInfo_get0_signature(CMS_SignerInfo *si);
 int CMS_SignerInfo_sign(CMS_SignerInfo *si);
 int CMS_SignerInfo_verify(CMS_SignerInfo *si);
 int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);
 BIO *CMS_SignedData_verify(CMS_SignedData *sd, BIO *detached_data,
-                           STACK_OF(X509) *scerts, X509_STORE *store,
-                           STACK_OF(X509) *extra, STACK_OF(X509_CRL) *crls,
-                           unsigned int flags,
-                           OSSL_LIB_CTX *libctx, const char *propq);
+    STACK_OF(X509) *scerts, X509_STORE *store,
+    STACK_OF(X509) *extra, STACK_OF(X509_CRL) *crls,
+    unsigned int flags,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);
 int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
-                            int algnid, int keysize);
+    int algnid, int keysize);
 int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);
 
 int CMS_signed_get_attr_count(const CMS_SignerInfo *si);
 int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                               int lastpos);
+    int lastpos);
 int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, const ASN1_OBJECT *obj,
-                               int lastpos);
+    int lastpos);
 X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);
 X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);
 int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
 int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                const ASN1_OBJECT *obj, int type,
-                                const void *bytes, int len);
+    const ASN1_OBJECT *obj, int type,
+    const void *bytes, int len);
 int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
-                                int nid, int type,
-                                const void *bytes, int len);
+    int nid, int type,
+    const void *bytes, int len);
 int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
-                                const char *attrname, int type,
-                                const void *bytes, int len);
+    const char *attrname, int type,
+    const void *bytes, int len);
 void *CMS_signed_get0_data_by_OBJ(const CMS_SignerInfo *si,
-                                  const ASN1_OBJECT *oid,
-                                  int lastpos, int type);
+    const ASN1_OBJECT *oid,
+    int lastpos, int type);
 
 int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);
 int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                                 int lastpos);
+    int lastpos);
 int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si,
-                                 const ASN1_OBJECT *obj, int lastpos);
+    const ASN1_OBJECT *obj, int lastpos);
 X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);
 X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);
 int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
 int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                  const ASN1_OBJECT *obj, int type,
-                                  const void *bytes, int len);
+    const ASN1_OBJECT *obj, int type,
+    const void *bytes, int len);
 int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
-                                  int nid, int type,
-                                  const void *bytes, int len);
+    int nid, int type,
+    const void *bytes, int len);
 int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
-                                  const char *attrname, int type,
-                                  const void *bytes, int len);
+    const char *attrname, int type,
+    const void *bytes, int len);
 void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                    int lastpos, int type);
+    int lastpos, int type);
 
 int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
 CMS_ReceiptRequest *CMS_ReceiptRequest_create0(
@@ -365,49 +369,49 @@ CMS_ReceiptRequest *CMS_ReceiptRequest_create0_ex(
 
 int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
 void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
-                                    ASN1_STRING **pcid,
-                                    int *pallorfirst,
-                                    STACK_OF(GENERAL_NAMES) **plist,
-                                    STACK_OF(GENERAL_NAMES) **prto);
+    ASN1_STRING **pcid,
+    int *pallorfirst,
+    STACK_OF(GENERAL_NAMES) **plist,
+    STACK_OF(GENERAL_NAMES) **prto);
 int CMS_RecipientInfo_kari_get0_alg(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pukm);
+    X509_ALGOR **palg,
+    ASN1_OCTET_STRING **pukm);
 STACK_OF(CMS_RecipientEncryptedKey)
 *CMS_RecipientInfo_kari_get0_reks(CMS_RecipientInfo *ri);
 
 int CMS_RecipientInfo_kari_get0_orig_id(CMS_RecipientInfo *ri,
-                                        X509_ALGOR **pubalg,
-                                        ASN1_BIT_STRING **pubkey,
-                                        ASN1_OCTET_STRING **keyid,
-                                        X509_NAME **issuer,
-                                        ASN1_INTEGER **sno);
+    X509_ALGOR **pubalg,
+    ASN1_BIT_STRING **pubkey,
+    ASN1_OCTET_STRING **keyid,
+    X509_NAME **issuer,
+    ASN1_INTEGER **sno);
 
 int CMS_RecipientInfo_kari_orig_id_cmp(CMS_RecipientInfo *ri, X509 *cert);
 
 int CMS_RecipientEncryptedKey_get0_id(CMS_RecipientEncryptedKey *rek,
-                                      ASN1_OCTET_STRING **keyid,
-                                      ASN1_GENERALIZEDTIME **tm,
-                                      CMS_OtherKeyAttribute **other,
-                                      X509_NAME **issuer, ASN1_INTEGER **sno);
+    ASN1_OCTET_STRING **keyid,
+    ASN1_GENERALIZEDTIME **tm,
+    CMS_OtherKeyAttribute **other,
+    X509_NAME **issuer, ASN1_INTEGER **sno);
 int CMS_RecipientEncryptedKey_cert_cmp(CMS_RecipientEncryptedKey *rek,
-                                       X509 *cert);
+    X509 *cert);
 int CMS_RecipientInfo_kari_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pk);
 int CMS_RecipientInfo_kari_set0_pkey_and_peer(CMS_RecipientInfo *ri, EVP_PKEY *pk, X509 *peer);
 EVP_CIPHER_CTX *CMS_RecipientInfo_kari_get0_ctx(CMS_RecipientInfo *ri);
 int CMS_RecipientInfo_kari_decrypt(CMS_ContentInfo *cms,
-                                   CMS_RecipientInfo *ri,
-                                   CMS_RecipientEncryptedKey *rek);
+    CMS_RecipientInfo *ri,
+    CMS_RecipientEncryptedKey *rek);
 
 int CMS_SharedInfo_encode(unsigned char **pder, X509_ALGOR *kekalg,
-                          ASN1_OCTET_STRING *ukm, int keylen);
+    ASN1_OCTET_STRING *ukm, int keylen);
 
 /* Backward compatibility for spelling errors. */
-# define CMS_R_UNKNOWN_DIGEST_ALGORITM CMS_R_UNKNOWN_DIGEST_ALGORITHM
-# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE \
+#define CMS_R_UNKNOWN_DIGEST_ALGORITM CMS_R_UNKNOWN_DIGEST_ALGORITHM
+#define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE \
     CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 #endif
diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h
index 5cfe07dbb3a3..8c12c5664fd1 100644
--- a/include/openssl/cmserr.h
+++ b/include/openssl/cmserr.h
@@ -9,118 +9,117 @@
  */
 
 #ifndef OPENSSL_CMSERR_H
-# define OPENSSL_CMSERR_H
-# pragma once
+#define OPENSSL_CMSERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_CMS
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_CMS
 
 /*
  * CMS reason codes.
  */
-#  define CMS_R_ADD_SIGNER_ERROR                           99
-#  define CMS_R_ATTRIBUTE_ERROR                            161
-#  define CMS_R_CERTIFICATE_ALREADY_PRESENT                175
-#  define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160
-#  define CMS_R_CERTIFICATE_VERIFY_ERROR                   100
-#  define CMS_R_CIPHER_AEAD_SET_TAG_ERROR                  184
-#  define CMS_R_CIPHER_GET_TAG                             185
-#  define CMS_R_CIPHER_INITIALISATION_ERROR                101
-#  define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR      102
-#  define CMS_R_CMS_DATAFINAL_ERROR                        103
-#  define CMS_R_CMS_LIB                                    104
-#  define CMS_R_CONTENTIDENTIFIER_MISMATCH                 170
-#  define CMS_R_CONTENT_NOT_FOUND                          105
-#  define CMS_R_CONTENT_TYPE_MISMATCH                      171
-#  define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA           106
-#  define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA            107
-#  define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA               108
-#  define CMS_R_CONTENT_VERIFY_ERROR                       109
-#  define CMS_R_CTRL_ERROR                                 110
-#  define CMS_R_CTRL_FAILURE                               111
-#  define CMS_R_DECODE_ERROR                               187
-#  define CMS_R_DECRYPT_ERROR                              112
-#  define CMS_R_ERROR_GETTING_PUBLIC_KEY                   113
-#  define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE      114
-#  define CMS_R_ERROR_SETTING_KEY                          115
-#  define CMS_R_ERROR_SETTING_RECIPIENTINFO                116
-#  define CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT     196
-#  define CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR          183
-#  define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH               117
-#  define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER           176
-#  define CMS_R_INVALID_KEY_LENGTH                         118
-#  define CMS_R_INVALID_LABEL                              190
-#  define CMS_R_INVALID_OAEP_PARAMETERS                    191
-#  define CMS_R_KDF_PARAMETER_ERROR                        186
-#  define CMS_R_MD_BIO_INIT_ERROR                          119
-#  define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH       120
-#  define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                 121
-#  define CMS_R_MSGSIGDIGEST_ERROR                         172
-#  define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE          162
-#  define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                  163
-#  define CMS_R_NEED_ONE_SIGNER                            164
-#  define CMS_R_NOT_A_SIGNED_RECEIPT                       165
-#  define CMS_R_NOT_ENCRYPTED_DATA                         122
-#  define CMS_R_NOT_KEK                                    123
-#  define CMS_R_NOT_KEY_AGREEMENT                          181
-#  define CMS_R_NOT_KEY_TRANSPORT                          124
-#  define CMS_R_NOT_PWRI                                   177
-#  define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE            125
-#  define CMS_R_NO_CIPHER                                  126
-#  define CMS_R_NO_CONTENT                                 127
-#  define CMS_R_NO_CONTENT_TYPE                            173
-#  define CMS_R_NO_DEFAULT_DIGEST                          128
-#  define CMS_R_NO_DIGEST_SET                              129
-#  define CMS_R_NO_KEY                                     130
-#  define CMS_R_NO_KEY_OR_CERT                             174
-#  define CMS_R_NO_MATCHING_DIGEST                         131
-#  define CMS_R_NO_MATCHING_RECIPIENT                      132
-#  define CMS_R_NO_MATCHING_SIGNATURE                      166
-#  define CMS_R_NO_MSGSIGDIGEST                            167
-#  define CMS_R_NO_PASSWORD                                178
-#  define CMS_R_NO_PRIVATE_KEY                             133
-#  define CMS_R_NO_PUBLIC_KEY                              134
-#  define CMS_R_NO_RECEIPT_REQUEST                         168
-#  define CMS_R_NO_SIGNERS                                 135
-#  define CMS_R_OPERATION_UNSUPPORTED                      182
-#  define CMS_R_PEER_KEY_ERROR                             188
-#  define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE     136
-#  define CMS_R_RECEIPT_DECODE_ERROR                       169
-#  define CMS_R_RECIPIENT_ERROR                            137
-#  define CMS_R_SHARED_INFO_ERROR                          189
-#  define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND               138
-#  define CMS_R_SIGNFINAL_ERROR                            139
-#  define CMS_R_SMIME_TEXT_ERROR                           140
-#  define CMS_R_STORE_INIT_ERROR                           141
-#  define CMS_R_TYPE_NOT_COMPRESSED_DATA                   142
-#  define CMS_R_TYPE_NOT_DATA                              143
-#  define CMS_R_TYPE_NOT_DIGESTED_DATA                     144
-#  define CMS_R_TYPE_NOT_ENCRYPTED_DATA                    145
-#  define CMS_R_TYPE_NOT_ENVELOPED_DATA                    146
-#  define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                 147
-#  define CMS_R_UNKNOWN_CIPHER                             148
-#  define CMS_R_UNKNOWN_DIGEST_ALGORITHM                   149
-#  define CMS_R_UNKNOWN_ID                                 150
-#  define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151
-#  define CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM   194
-#  define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152
-#  define CMS_R_UNSUPPORTED_ENCRYPTION_TYPE                192
-#  define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153
-#  define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM       179
-#  define CMS_R_UNSUPPORTED_LABEL_SOURCE                   193
-#  define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE             155
-#  define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
-#  define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM            195
-#  define CMS_R_UNSUPPORTED_TYPE                           156
-#  define CMS_R_UNWRAP_ERROR                               157
-#  define CMS_R_UNWRAP_FAILURE                             180
-#  define CMS_R_VERIFICATION_FAILURE                       158
-#  define CMS_R_WRAP_ERROR                                 159
+#define CMS_R_ADD_SIGNER_ERROR 99
+#define CMS_R_ATTRIBUTE_ERROR 161
+#define CMS_R_CERTIFICATE_ALREADY_PRESENT 175
+#define CMS_R_CERTIFICATE_HAS_NO_KEYID 160
+#define CMS_R_CERTIFICATE_VERIFY_ERROR 100
+#define CMS_R_CIPHER_AEAD_IN_ENVELOPED_DATA 200
+#define CMS_R_CIPHER_AEAD_SET_TAG_ERROR 184
+#define CMS_R_CIPHER_GET_TAG 185
+#define CMS_R_CIPHER_INITIALISATION_ERROR 101
+#define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR 102
+#define CMS_R_CMS_DATAFINAL_ERROR 103
+#define CMS_R_CMS_LIB 104
+#define CMS_R_CONTENTIDENTIFIER_MISMATCH 170
+#define CMS_R_CONTENT_NOT_FOUND 105
+#define CMS_R_CONTENT_TYPE_MISMATCH 171
+#define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA 106
+#define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA 107
+#define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA 108
+#define CMS_R_CONTENT_VERIFY_ERROR 109
+#define CMS_R_CTRL_ERROR 110
+#define CMS_R_CTRL_FAILURE 111
+#define CMS_R_DECODE_ERROR 187
+#define CMS_R_DECRYPT_ERROR 112
+#define CMS_R_ERROR_GETTING_PUBLIC_KEY 113
+#define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE 114
+#define CMS_R_ERROR_SETTING_KEY 115
+#define CMS_R_ERROR_SETTING_RECIPIENTINFO 116
+#define CMS_R_ERROR_UNSUPPORTED_STATIC_KEY_AGREEMENT 196
+#define CMS_R_ESS_SIGNING_CERTID_MISMATCH_ERROR 183
+#define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH 117
+#define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER 176
+#define CMS_R_INVALID_KEY_LENGTH 118
+#define CMS_R_INVALID_LABEL 190
+#define CMS_R_INVALID_OAEP_PARAMETERS 191
+#define CMS_R_KDF_PARAMETER_ERROR 186
+#define CMS_R_MD_BIO_INIT_ERROR 119
+#define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH 120
+#define CMS_R_MESSAGEDIGEST_WRONG_LENGTH 121
+#define CMS_R_MSGSIGDIGEST_ERROR 172
+#define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE 162
+#define CMS_R_MSGSIGDIGEST_WRONG_LENGTH 163
+#define CMS_R_NEED_ONE_SIGNER 164
+#define CMS_R_NOT_A_SIGNED_RECEIPT 165
+#define CMS_R_NOT_ENCRYPTED_DATA 122
+#define CMS_R_NOT_KEK 123
+#define CMS_R_NOT_KEY_AGREEMENT 181
+#define CMS_R_NOT_KEY_TRANSPORT 124
+#define CMS_R_NOT_PWRI 177
+#define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 125
+#define CMS_R_NO_CIPHER 126
+#define CMS_R_NO_CONTENT 127
+#define CMS_R_NO_CONTENT_TYPE 173
+#define CMS_R_NO_DEFAULT_DIGEST 128
+#define CMS_R_NO_DIGEST_SET 129
+#define CMS_R_NO_KEY 130
+#define CMS_R_NO_KEY_OR_CERT 174
+#define CMS_R_NO_MATCHING_DIGEST 131
+#define CMS_R_NO_MATCHING_RECIPIENT 132
+#define CMS_R_NO_MATCHING_SIGNATURE 166
+#define CMS_R_NO_MSGSIGDIGEST 167
+#define CMS_R_NO_PASSWORD 178
+#define CMS_R_NO_PRIVATE_KEY 133
+#define CMS_R_NO_PUBLIC_KEY 134
+#define CMS_R_NO_RECEIPT_REQUEST 168
+#define CMS_R_NO_SIGNERS 135
+#define CMS_R_OPERATION_UNSUPPORTED 182
+#define CMS_R_PEER_KEY_ERROR 188
+#define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 136
+#define CMS_R_RECEIPT_DECODE_ERROR 169
+#define CMS_R_RECIPIENT_ERROR 137
+#define CMS_R_SHARED_INFO_ERROR 189
+#define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND 138
+#define CMS_R_SIGNFINAL_ERROR 139
+#define CMS_R_SMIME_TEXT_ERROR 140
+#define CMS_R_STORE_INIT_ERROR 141
+#define CMS_R_TYPE_NOT_COMPRESSED_DATA 142
+#define CMS_R_TYPE_NOT_DATA 143
+#define CMS_R_TYPE_NOT_DIGESTED_DATA 144
+#define CMS_R_TYPE_NOT_ENCRYPTED_DATA 145
+#define CMS_R_TYPE_NOT_ENVELOPED_DATA 146
+#define CMS_R_UNABLE_TO_FINALIZE_CONTEXT 147
+#define CMS_R_UNKNOWN_CIPHER 148
+#define CMS_R_UNKNOWN_DIGEST_ALGORITHM 149
+#define CMS_R_UNKNOWN_ID 150
+#define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM 151
+#define CMS_R_UNSUPPORTED_CONTENT_ENCRYPTION_ALGORITHM 194
+#define CMS_R_UNSUPPORTED_CONTENT_TYPE 152
+#define CMS_R_UNSUPPORTED_ENCRYPTION_TYPE 192
+#define CMS_R_UNSUPPORTED_KEK_ALGORITHM 153
+#define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM 179
+#define CMS_R_UNSUPPORTED_LABEL_SOURCE 193
+#define CMS_R_UNSUPPORTED_RECIPIENTINFO_TYPE 155
+#define CMS_R_UNSUPPORTED_RECIPIENT_TYPE 154
+#define CMS_R_UNSUPPORTED_SIGNATURE_ALGORITHM 195
+#define CMS_R_UNSUPPORTED_TYPE 156
+#define CMS_R_UNWRAP_ERROR 157
+#define CMS_R_UNWRAP_FAILURE 180
+#define CMS_R_VERIFICATION_FAILURE 158
+#define CMS_R_WRAP_ERROR 159
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/comp.h.in b/include/openssl/comp.h.in
index bd1efdc568e9..c29de506ff8b 100644
--- a/include/openssl/comp.h.in
+++ b/include/openssl/comp.h.in
@@ -7,42 +7,42 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_COMP_H
-# define OPENSSL_COMP_H
-# pragma once
+#define OPENSSL_COMP_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_COMP_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_COMP_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/crypto.h>
-# include <openssl/comperr.h>
-# ifdef  __cplusplus
+#include <openssl/crypto.h>
+#include <openssl/comperr.h>
+#ifdef __cplusplus
 extern "C" {
-# endif
-
-
+#endif
 
-# ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
 
 COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
 const COMP_METHOD *COMP_CTX_get_method(const COMP_CTX *ctx);
-int COMP_CTX_get_type(const COMP_CTX* comp);
+int COMP_CTX_get_type(const COMP_CTX *comp);
 int COMP_get_type(const COMP_METHOD *meth);
 const char *COMP_get_name(const COMP_METHOD *meth);
 void COMP_CTX_free(COMP_CTX *ctx);
 
 int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                        unsigned char *in, int ilen);
+    unsigned char *in, int ilen);
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                      unsigned char *in, int ilen);
+    unsigned char *in, int ilen);
 
 COMP_METHOD *COMP_zlib(void);
 COMP_METHOD *COMP_zlib_oneshot(void);
@@ -51,26 +51,29 @@ COMP_METHOD *COMP_brotli_oneshot(void);
 COMP_METHOD *COMP_zstd(void);
 COMP_METHOD *COMP_zstd_oneshot(void);
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   define COMP_zlib_cleanup() while(0) continue
-#  endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define COMP_zlib_cleanup() \
+    while (0)               \
+    continue
+#endif
 
-#  ifdef OPENSSL_BIO_H
+#ifdef OPENSSL_BIO_H
 const BIO_METHOD *BIO_f_zlib(void);
 const BIO_METHOD *BIO_f_brotli(void);
 const BIO_METHOD *BIO_f_zstd(void);
-#  endif
+#endif
 
-# endif
+#endif
 
 typedef struct ssl_comp_st SSL_COMP;
 
+/* clang-format off */
 {-
     generate_stack_macros("SSL_COMP");
 -}
+/* clang-format on */
 
-
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h
index 1948d37f1a00..90ec7c1144be 100644
--- a/include/openssl/comperr.h
+++ b/include/openssl/comperr.h
@@ -9,30 +9,28 @@
  */
 
 #ifndef OPENSSL_COMPERR_H
-# define OPENSSL_COMPERR_H
-# pragma once
+#define OPENSSL_COMPERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_COMP
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_COMP
 
 /*
  * COMP reason codes.
  */
-#  define COMP_R_BROTLI_DECODE_ERROR                       102
-#  define COMP_R_BROTLI_ENCODE_ERROR                       103
-#  define COMP_R_BROTLI_NOT_SUPPORTED                      104
-#  define COMP_R_ZLIB_DEFLATE_ERROR                        99
-#  define COMP_R_ZLIB_INFLATE_ERROR                        100
-#  define COMP_R_ZLIB_NOT_SUPPORTED                        101
-#  define COMP_R_ZSTD_COMPRESS_ERROR                       105
-#  define COMP_R_ZSTD_DECODE_ERROR                         106
-#  define COMP_R_ZSTD_DECOMPRESS_ERROR                     107
-#  define COMP_R_ZSTD_NOT_SUPPORTED                        108
+#define COMP_R_BROTLI_DECODE_ERROR 102
+#define COMP_R_BROTLI_ENCODE_ERROR 103
+#define COMP_R_BROTLI_NOT_SUPPORTED 104
+#define COMP_R_ZLIB_DEFLATE_ERROR 99
+#define COMP_R_ZLIB_INFLATE_ERROR 100
+#define COMP_R_ZLIB_NOT_SUPPORTED 101
+#define COMP_R_ZSTD_COMPRESS_ERROR 105
+#define COMP_R_ZSTD_DECODE_ERROR 106
+#define COMP_R_ZSTD_DECOMPRESS_ERROR 107
+#define COMP_R_ZSTD_NOT_SUPPORTED 108
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/conf.h.in b/include/openssl/conf.h.in
index 5663287089c9..0ebd2b9e0342 100644
--- a/include/openssl/conf.h.in
+++ b/include/openssl/conf.h.in
@@ -9,30 +9,32 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros generate_lhash_macros);
 -}
+/* clang-format on */
 
-#ifndef  OPENSSL_CONF_H
-# define OPENSSL_CONF_H
-# pragma once
+#ifndef OPENSSL_CONF_H
+#define OPENSSL_CONF_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CONF_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CONF_H
+#endif
 
-# include <openssl/bio.h>
-# include <openssl/lhash.h>
-# include <openssl/safestack.h>
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include <openssl/conferr.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
+#include <openssl/safestack.h>
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include <openssl/conferr.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -42,18 +44,20 @@ typedef struct {
     char *value;
 } CONF_VALUE;
 
+/* clang-format off */
 {-
     generate_stack_macros("CONF_VALUE")
     .generate_lhash_macros("CONF_VALUE");
 -}
+/* clang-format on */
 
 struct conf_st;
 struct conf_method_st;
 typedef struct conf_method_st CONF_METHOD;
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  include <openssl/conftypes.h>
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#include <openssl/conftypes.h>
+#endif
 
 /* Module definitions */
 typedef struct conf_imodule_st CONF_IMODULE;
@@ -63,32 +67,32 @@ STACK_OF(CONF_MODULE);
 STACK_OF(CONF_IMODULE);
 
 /* DSO module function typedefs */
-typedef int conf_init_func (CONF_IMODULE *md, const CONF *cnf);
-typedef void conf_finish_func (CONF_IMODULE *md);
+typedef int conf_init_func(CONF_IMODULE *md, const CONF *cnf);
+typedef void conf_finish_func(CONF_IMODULE *md);
 
-# define CONF_MFLAGS_IGNORE_ERRORS       0x1
-# define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
-# define CONF_MFLAGS_SILENT              0x4
-# define CONF_MFLAGS_NO_DSO              0x8
-# define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
-# define CONF_MFLAGS_DEFAULT_SECTION     0x20
+#define CONF_MFLAGS_IGNORE_ERRORS 0x1
+#define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
+#define CONF_MFLAGS_SILENT 0x4
+#define CONF_MFLAGS_NO_DSO 0x8
+#define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
+#define CONF_MFLAGS_DEFAULT_SECTION 0x20
 
 int CONF_set_default_method(CONF_METHOD *meth);
 void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
 LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-                                long *eline);
-# ifndef OPENSSL_NO_STDIO
+    long *eline);
+#ifndef OPENSSL_NO_STDIO
 LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-                                   long *eline);
-# endif
+    long *eline);
+#endif
 LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-                                    long *eline);
+    long *eline);
 STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-                                       const char *section);
+    const char *section);
 char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                      const char *name);
+    const char *name);
 long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                     const char *name);
+    const char *name);
 void CONF_free(LHASH_OF(CONF_VALUE) *conf);
 #ifndef OPENSSL_NO_STDIO
 int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
@@ -99,7 +103,7 @@ OSSL_DEPRECATEDIN_1_1_0 void OPENSSL_config(const char *config_name);
 #endif
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# define OPENSSL_no_config() \
+#define OPENSSL_no_config() \
     OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG, NULL)
 #endif
 
@@ -119,38 +123,40 @@ void NCONF_free(CONF *conf);
 void NCONF_free_data(CONF *conf);
 
 int NCONF_load(CONF *conf, const char *file, long *eline);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);
-# endif
+#endif
 int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
 STACK_OF(OPENSSL_CSTRING) *NCONF_get_section_names(const CONF *conf);
 STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,
-                                        const char *section);
+    const char *section);
 char *NCONF_get_string(const CONF *conf, const char *group, const char *name);
 int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
-                       long *result);
+    long *result);
 #ifndef OPENSSL_NO_STDIO
 int NCONF_dump_fp(const CONF *conf, FILE *out);
 #endif
 int NCONF_dump_bio(const CONF *conf, BIO *out);
 
-#define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
+#define NCONF_get_number(c, g, n, r) NCONF_get_number_e(c, g, n, r)
 
 /* Module functions */
 
 int CONF_modules_load(const CONF *cnf, const char *appname,
-                      unsigned long flags);
+    unsigned long flags);
 int CONF_modules_load_file_ex(OSSL_LIB_CTX *libctx, const char *filename,
-                              const char *appname, unsigned long flags);
+    const char *appname, unsigned long flags);
 int CONF_modules_load_file(const char *filename, const char *appname,
-                           unsigned long flags);
+    unsigned long flags);
 void CONF_modules_unload(int all);
 void CONF_modules_finish(void);
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# define CONF_modules_free() while(0) continue
+#define CONF_modules_free() \
+    while (0)               \
+    continue
 #endif
 int CONF_module_add(const char *name, conf_init_func *ifunc,
-                    conf_finish_func *ffunc);
+    conf_finish_func *ffunc);
 
 const char *CONF_imodule_get_name(const CONF_IMODULE *md);
 const char *CONF_imodule_get_value(const CONF_IMODULE *md);
@@ -165,13 +171,12 @@ void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
 char *CONF_get1_default_config_file(void);
 
 int CONF_parse_list(const char *list, int sep, int nospc,
-                    int (*list_cb) (const char *elem, int len, void *usr),
-                    void *arg);
+    int (*list_cb)(const char *elem, int len, void *usr),
+    void *arg);
 
 void OPENSSL_load_builtin_modules(void);
 
-
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/conf_api.h b/include/openssl/conf_api.h
index ed67d5778f1d..f3f3c640853a 100644
--- a/include/openssl/conf_api.h
+++ b/include/openssl/conf_api.h
@@ -7,19 +7,19 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef  OPENSSL_CONF_API_H
-# define OPENSSL_CONF_API_H
-# pragma once
+#ifndef OPENSSL_CONF_API_H
+#define OPENSSL_CONF_API_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CONF_API_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CONF_API_H
+#endif
 
-# include <openssl/lhash.h>
-# include <openssl/conf.h>
+#include <openssl/lhash.h>
+#include <openssl/conf.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -29,18 +29,18 @@ CONF_VALUE *_CONF_new_section(CONF *conf, const char *section);
 CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section);
 /* Up until OpenSSL 0.9.5a, this was CONF_get_section */
 STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
-                                               const char *section);
+    const char *section);
 
 int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value);
 char *_CONF_get_string(const CONF *conf, const char *section,
-                       const char *name);
+    const char *name);
 long _CONF_get_number(const CONF *conf, const char *section,
-                      const char *name);
+    const char *name);
 
 int _CONF_new_data(CONF *conf);
 void _CONF_free_data(CONF *conf);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h
index a8798e792412..0b984dd65d4d 100644
--- a/include/openssl/conferr.h
+++ b/include/openssl/conferr.h
@@ -9,44 +9,42 @@
  */
 
 #ifndef OPENSSL_CONFERR_H
-# define OPENSSL_CONFERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_CONFERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * CONF reason codes.
  */
-# define CONF_R_ERROR_LOADING_DSO                         110
-# define CONF_R_INVALID_PRAGMA                            122
-# define CONF_R_LIST_CANNOT_BE_NULL                       115
-# define CONF_R_MANDATORY_BRACES_IN_VARIABLE_EXPANSION    123
-# define CONF_R_MISSING_CLOSE_SQUARE_BRACKET              100
-# define CONF_R_MISSING_EQUAL_SIGN                        101
-# define CONF_R_MISSING_INIT_FUNCTION                     112
-# define CONF_R_MODULE_INITIALIZATION_ERROR               109
-# define CONF_R_NO_CLOSE_BRACE                            102
-# define CONF_R_NO_CONF                                   105
-# define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE           106
-# define CONF_R_NO_SECTION                                107
-# define CONF_R_NO_SUCH_FILE                              114
-# define CONF_R_NO_VALUE                                  108
-# define CONF_R_NUMBER_TOO_LARGE                          121
-# define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION   124
-# define CONF_R_RECURSIVE_DIRECTORY_INCLUDE               111
-# define CONF_R_RECURSIVE_SECTION_REFERENCE               126
-# define CONF_R_RELATIVE_PATH                             125
-# define CONF_R_SSL_COMMAND_SECTION_EMPTY                 117
-# define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND             118
-# define CONF_R_SSL_SECTION_EMPTY                         119
-# define CONF_R_SSL_SECTION_NOT_FOUND                     120
-# define CONF_R_UNABLE_TO_CREATE_NEW_SECTION              103
-# define CONF_R_UNKNOWN_MODULE_NAME                       113
-# define CONF_R_VARIABLE_EXPANSION_TOO_LONG               116
-# define CONF_R_VARIABLE_HAS_NO_VALUE                     104
+#define CONF_R_ERROR_LOADING_DSO 110
+#define CONF_R_INVALID_PRAGMA 122
+#define CONF_R_LIST_CANNOT_BE_NULL 115
+#define CONF_R_MANDATORY_BRACES_IN_VARIABLE_EXPANSION 123
+#define CONF_R_MISSING_CLOSE_SQUARE_BRACKET 100
+#define CONF_R_MISSING_EQUAL_SIGN 101
+#define CONF_R_MISSING_INIT_FUNCTION 112
+#define CONF_R_MODULE_INITIALIZATION_ERROR 109
+#define CONF_R_NO_CLOSE_BRACE 102
+#define CONF_R_NO_CONF 105
+#define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE 106
+#define CONF_R_NO_SECTION 107
+#define CONF_R_NO_SUCH_FILE 114
+#define CONF_R_NO_VALUE 108
+#define CONF_R_NUMBER_TOO_LARGE 121
+#define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124
+#define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111
+#define CONF_R_RECURSIVE_SECTION_REFERENCE 126
+#define CONF_R_RELATIVE_PATH 125
+#define CONF_R_SSL_COMMAND_SECTION_EMPTY 117
+#define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118
+#define CONF_R_SSL_SECTION_EMPTY 119
+#define CONF_R_SSL_SECTION_NOT_FOUND 120
+#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
+#define CONF_R_UNKNOWN_MODULE_NAME 113
+#define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116
+#define CONF_R_VARIABLE_HAS_NO_VALUE 104
 
 #endif
diff --git a/include/openssl/configuration.h.in b/include/openssl/configuration.h.in
index 86077d0a6f5d..4e7bff16c7b2 100644
--- a/include/openssl/configuration.h.in
+++ b/include/openssl/configuration.h.in
@@ -10,21 +10,22 @@
  */
 
 #ifndef OPENSSL_CONFIGURATION_H
-# define OPENSSL_CONFIGURATION_H
-# pragma once
+#define OPENSSL_CONFIGURATION_H
+#pragma once
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# ifdef OPENSSL_ALGORITHM_DEFINES
-#  error OPENSSL_ALGORITHM_DEFINES no longer supported
-# endif
+#ifdef OPENSSL_ALGORITHM_DEFINES
+#error OPENSSL_ALGORITHM_DEFINES no longer supported
+#endif
 
 /*
  * OpenSSL was configured with the following options:
  */
 
+/* clang-format off */
 {- if (@{$config{openssl_sys_defines}}) {
       foreach (@{$config{openssl_sys_defines}}) {
         $OUT .= "# ifndef $_\n";
@@ -45,31 +46,44 @@ extern "C" {
     }
     "";
 -}
+/* clang-format on */
 
 /* Generate 80386 code? */
+/* clang-format off */
 {- $config{processor} eq "386" ? "# define" : "# undef" -} I386_ONLY
+/* clang-format on */
 
 /*
  * The following are cipher-specific, but are part of the public API.
  */
-# if !defined(OPENSSL_SYS_UEFI)
+#if !defined(OPENSSL_SYS_UEFI)
+    /* clang-format off */
 {- $config{bn_ll} ? "#  define" : "#  undef" -} BN_LLONG
-/* Only one for the following should be defined */
+    /* clang-format on */
+    /* Only one for the following should be defined */
+    /* clang-format off */
 {- $config{b64l} ? "#  define" : "#  undef" -} SIXTY_FOUR_BIT_LONG
+    /* clang-format on */
+    /* clang-format off */
 {- $config{b64}  ? "#  define" : "#  undef" -} SIXTY_FOUR_BIT
+    /* clang-format on */
+    /* clang-format off */
 {- $config{b32}  ? "#  define" : "#  undef" -} THIRTY_TWO_BIT
-# endif
+/* clang-format on */
+#endif
 
+/* clang-format off */
 # define RC4_INT {- $config{rc4_int} -}
+/* clang-format on */
 
-# if defined(OPENSSL_NO_COMP) || (defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD) && defined(OPENSSL_NO_ZLIB))
-#  define OPENSSL_NO_COMP_ALG
-# else
-#  undef  OPENSSL_NO_COMP_ALG
-# endif
+#if defined(OPENSSL_NO_COMP) || (defined(OPENSSL_NO_BROTLI) && defined(OPENSSL_NO_ZSTD) && defined(OPENSSL_NO_ZLIB))
+#define OPENSSL_NO_COMP_ALG
+#else
+#undef OPENSSL_NO_COMP_ALG
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
-#endif                          /* OPENSSL_CONFIGURATION_H */
+#endif /* OPENSSL_CONFIGURATION_H */
diff --git a/include/openssl/conftypes.h b/include/openssl/conftypes.h
index 17cefaa44335..f2d2be19d067 100644
--- a/include/openssl/conftypes.h
+++ b/include/openssl/conftypes.h
@@ -7,12 +7,12 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef  OPENSSL_CONFTYPES_H
-# define OPENSSL_CONFTYPES_H
-# pragma once
+#ifndef OPENSSL_CONFTYPES_H
+#define OPENSSL_CONFTYPES_H
+#pragma once
 
-#ifndef  OPENSSL_CONF_H
-# include <openssl/conf.h>
+#ifndef OPENSSL_CONF_H
+#include <openssl/conf.h>
 #endif
 
 /*
@@ -20,15 +20,15 @@
  */
 struct conf_method_st {
     const char *name;
-    CONF *(*create) (CONF_METHOD *meth);
-    int (*init) (CONF *conf);
-    int (*destroy) (CONF *conf);
-    int (*destroy_data) (CONF *conf);
-    int (*load_bio) (CONF *conf, BIO *bp, long *eline);
-    int (*dump) (const CONF *conf, BIO *bp);
-    int (*is_number) (const CONF *conf, char c);
-    int (*to_int) (const CONF *conf, char c);
-    int (*load) (CONF *conf, const char *name, long *eline);
+    CONF *(*create)(CONF_METHOD *meth);
+    int (*init)(CONF *conf);
+    int (*destroy)(CONF *conf);
+    int (*destroy_data)(CONF *conf);
+    int (*load_bio)(CONF *conf, BIO *bp, long *eline);
+    int (*dump)(const CONF *conf, BIO *bp);
+    int (*is_number)(const CONF *conf, char c);
+    int (*to_int)(const CONF *conf, char c);
+    int (*load)(CONF *conf, const char *name, long *eline);
 };
 
 struct conf_st {
diff --git a/include/openssl/core.h b/include/openssl/core.h
index 18c199182e34..a883173ddd2a 100644
--- a/include/openssl/core.h
+++ b/include/openssl/core.h
@@ -8,15 +8,15 @@
  */
 
 #ifndef OPENSSL_CORE_H
-# define OPENSSL_CORE_H
-# pragma once
+#define OPENSSL_CORE_H
+#pragma once
 
-# include <stddef.h>
-# include <openssl/types.h>
+#include <stddef.h>
+#include <openssl/types.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*-
  * Base types
@@ -42,7 +42,7 @@ struct ossl_dispatch_st {
     void (*function)(void);
 };
 
-# define OSSL_DISPATCH_END \
+#define OSSL_DISPATCH_END \
     { 0, NULL }
 
 /*
@@ -70,7 +70,7 @@ struct ossl_item_st {
  * An array of these is always terminated by algorithm_names == NULL
  */
 struct ossl_algorithm_st {
-    const char *algorithm_names;     /* key */
+    const char *algorithm_names; /* key */
     const char *property_definition; /* key */
     const OSSL_DISPATCH *implementation;
     const char *algorithm_description;
@@ -83,11 +83,11 @@ struct ossl_algorithm_st {
  * An array of these is always terminated by key == NULL
  */
 struct ossl_param_st {
-    const char *key;             /* the name of the parameter */
-    unsigned int data_type;      /* declare what kind of content is in buffer */
-    void *data;                  /* value being passed in or out */
-    size_t data_size;            /* data size */
-    size_t return_size;          /* returned content size */
+    const char *key; /* the name of the parameter */
+    unsigned int data_type; /* declare what kind of content is in buffer */
+    void *data; /* value being passed in or out */
+    size_t data_size; /* data size */
+    size_t return_size; /* returned content size */
 };
 
 /* Currently supported OSSL_PARAM data types */
@@ -103,24 +103,24 @@ struct ossl_param_st {
  * buffer size is correct and the buffer itself is properly aligned (for
  * example by having the buffer field point at a C integer).
  */
-# define OSSL_PARAM_INTEGER              1
-# define OSSL_PARAM_UNSIGNED_INTEGER     2
+#define OSSL_PARAM_INTEGER 1
+#define OSSL_PARAM_UNSIGNED_INTEGER 2
 /*-
  * OSSL_PARAM_REAL
  * is a C binary floating point values in native form and alignment.
  */
-# define OSSL_PARAM_REAL                 3
+#define OSSL_PARAM_REAL 3
 /*-
  * OSSL_PARAM_UTF8_STRING
  * is a printable string.  It is expected to be printed as it is.
  */
-# define OSSL_PARAM_UTF8_STRING          4
+#define OSSL_PARAM_UTF8_STRING 4
 /*-
  * OSSL_PARAM_OCTET_STRING
  * is a string of bytes with no further specification.  It is expected to be
  * printed as a hexdump.
  */
-# define OSSL_PARAM_OCTET_STRING         5
+#define OSSL_PARAM_OCTET_STRING 5
 /*-
  * OSSL_PARAM_UTF8_PTR
  * is a pointer to a printable string.  It is expected to be printed as it is.
@@ -138,7 +138,7 @@ struct ossl_param_st {
  * EXTRA WARNING!  If you are not completely sure you most likely want
  * to use the OSSL_PARAM_UTF8_STRING type.
  */
-# define OSSL_PARAM_UTF8_PTR             6
+#define OSSL_PARAM_UTF8_PTR 6
 /*-
  * OSSL_PARAM_OCTET_PTR
  * is a pointer to a string of bytes with no further specification.  It is
@@ -157,7 +157,7 @@ struct ossl_param_st {
  * EXTRA WARNING!  If you are not completely sure you most likely want
  * to use the OSSL_PARAM_OCTET_STRING type.
  */
-# define OSSL_PARAM_OCTET_PTR            7
+#define OSSL_PARAM_OCTET_PTR 7
 
 /*
  * Typedef for the thread stop handling callback. Used both internally and by
@@ -171,7 +171,6 @@ struct ossl_param_st {
  */
 typedef void (*OSSL_thread_stop_handler_fn)(void *arg);
 
-
 /*-
  * Provider entry point
  * --------------------
@@ -190,18 +189,18 @@ typedef void (*OSSL_thread_stop_handler_fn)(void *arg);
  *              provider needs it.  This value is passed to other provider
  *              functions, notably other context constructors.
  */
-typedef int (OSSL_provider_init_fn)(const OSSL_CORE_HANDLE *handle,
-                                    const OSSL_DISPATCH *in,
-                                    const OSSL_DISPATCH **out,
-                                    void **provctx);
-# ifdef __VMS
-#  pragma names save
-#  pragma names uppercase,truncated
-# endif
+typedef int(OSSL_provider_init_fn)(const OSSL_CORE_HANDLE *handle,
+    const OSSL_DISPATCH *in,
+    const OSSL_DISPATCH **out,
+    void **provctx);
+#ifdef __VMS
+#pragma names save
+#pragma names uppercase, truncated
+#endif
 OPENSSL_EXPORT OSSL_provider_init_fn OSSL_provider_init;
-# ifdef __VMS
-#  pragma names restore
-# endif
+#ifdef __VMS
+#pragma names restore
+#endif
 
 /*
  * Generic callback function signature.
@@ -216,21 +215,21 @@ OPENSSL_EXPORT OSSL_provider_init_fn OSSL_provider_init;
  * libcrypto may use the OSSL_PARAM array to create arguments for an
  * application callback it knows about.
  */
-typedef int (OSSL_CALLBACK)(const OSSL_PARAM params[], void *arg);
-typedef int (OSSL_INOUT_CALLBACK)(const OSSL_PARAM in_params[],
-                                  OSSL_PARAM out_params[], void *arg);
+typedef int(OSSL_CALLBACK)(const OSSL_PARAM params[], void *arg);
+typedef int(OSSL_INOUT_CALLBACK)(const OSSL_PARAM in_params[],
+    OSSL_PARAM out_params[], void *arg);
 /*
  * Passphrase callback function signature
  *
  * This is similar to the generic callback function above, but adds a
  * result parameter.
  */
-typedef int (OSSL_PASSPHRASE_CALLBACK)(char *pass, size_t pass_size,
-                                       size_t *pass_len,
-                                       const OSSL_PARAM params[], void *arg);
+typedef int(OSSL_PASSPHRASE_CALLBACK)(char *pass, size_t pass_size,
+    size_t *pass_len,
+    const OSSL_PARAM params[], void *arg);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h
index 13de04e2622c..65faa5f2cf12 100644
--- a/include/openssl/core_dispatch.h
+++ b/include/openssl/core_dispatch.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OPENSSL_CORE_NUMBERS_H
-# define OPENSSL_CORE_NUMBERS_H
-# pragma once
+#define OPENSSL_CORE_NUMBERS_H
+#pragma once
 
-# include <stdarg.h>
-# include <openssl/core.h>
-# include <openssl/indicator.h>
+#include <stdarg.h>
+#include <openssl/core.h>
+#include <openssl/indicator.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * Generic function pointer for provider method arrays, or other contexts where
@@ -52,12 +52,13 @@ typedef void (*OSSL_FUNC)(void);
  * Note: This is considered a "reserved" internal macro. Applications should
  * not use this or assume its existence.
  */
-#define OSSL_CORE_MAKE_FUNC(type,name,args)                             \
-    typedef type (OSSL_FUNC_##name##_fn)args;                           \
-    static ossl_unused ossl_inline \
-    OSSL_FUNC_##name##_fn *OSSL_FUNC_##name(const OSSL_DISPATCH *opf)   \
-    {                                                                   \
-        return (OSSL_FUNC_##name##_fn *)opf->function;                  \
+#define OSSL_CORE_MAKE_FUNC(type, name, args)          \
+    typedef type(OSSL_FUNC_##name##_fn) args;          \
+    static ossl_unused ossl_inline                     \
+        OSSL_FUNC_##name##_fn *                        \
+        OSSL_FUNC_##name(const OSSL_DISPATCH *opf)     \
+    {                                                  \
+        return (OSSL_FUNC_##name##_fn *)opf->function; \
     }
 
 /*
@@ -68,298 +69,266 @@ typedef void (*OSSL_FUNC)(void);
  * therefore NEVER be used as a function identity.
  */
 /* Functions provided by the Core to the provider, reserved numbers 1-1023 */
-# define OSSL_FUNC_CORE_GETTABLE_PARAMS        1
+#define OSSL_FUNC_CORE_GETTABLE_PARAMS 1
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,
-                    core_gettable_params,(const OSSL_CORE_HANDLE *prov))
-# define OSSL_FUNC_CORE_GET_PARAMS             2
-OSSL_CORE_MAKE_FUNC(int,core_get_params,(const OSSL_CORE_HANDLE *prov,
-                                         OSSL_PARAM params[]))
-# define OSSL_FUNC_CORE_THREAD_START           3
-OSSL_CORE_MAKE_FUNC(int,core_thread_start,(const OSSL_CORE_HANDLE *prov,
-                                           OSSL_thread_stop_handler_fn handfn,
-                                           void *arg))
-# define OSSL_FUNC_CORE_GET_LIBCTX             4
-OSSL_CORE_MAKE_FUNC(OPENSSL_CORE_CTX *,core_get_libctx,
-                    (const OSSL_CORE_HANDLE *prov))
-# define OSSL_FUNC_CORE_NEW_ERROR              5
-OSSL_CORE_MAKE_FUNC(void,core_new_error,(const OSSL_CORE_HANDLE *prov))
-# define OSSL_FUNC_CORE_SET_ERROR_DEBUG        6
-OSSL_CORE_MAKE_FUNC(void,core_set_error_debug,
-                    (const OSSL_CORE_HANDLE *prov,
-                     const char *file, int line, const char *func))
-# define OSSL_FUNC_CORE_VSET_ERROR             7
-OSSL_CORE_MAKE_FUNC(void,core_vset_error,
-                    (const OSSL_CORE_HANDLE *prov,
-                     uint32_t reason, const char *fmt, va_list args))
-# define OSSL_FUNC_CORE_SET_ERROR_MARK         8
+    core_gettable_params, (const OSSL_CORE_HANDLE *prov))
+#define OSSL_FUNC_CORE_GET_PARAMS 2
+OSSL_CORE_MAKE_FUNC(int, core_get_params, (const OSSL_CORE_HANDLE *prov, OSSL_PARAM params[]))
+#define OSSL_FUNC_CORE_THREAD_START 3
+OSSL_CORE_MAKE_FUNC(int, core_thread_start, (const OSSL_CORE_HANDLE *prov, OSSL_thread_stop_handler_fn handfn, void *arg))
+#define OSSL_FUNC_CORE_GET_LIBCTX 4
+OSSL_CORE_MAKE_FUNC(OPENSSL_CORE_CTX *, core_get_libctx,
+    (const OSSL_CORE_HANDLE *prov))
+#define OSSL_FUNC_CORE_NEW_ERROR 5
+OSSL_CORE_MAKE_FUNC(void, core_new_error, (const OSSL_CORE_HANDLE *prov))
+#define OSSL_FUNC_CORE_SET_ERROR_DEBUG 6
+OSSL_CORE_MAKE_FUNC(void, core_set_error_debug,
+    (const OSSL_CORE_HANDLE *prov,
+        const char *file, int line, const char *func))
+#define OSSL_FUNC_CORE_VSET_ERROR 7
+OSSL_CORE_MAKE_FUNC(void, core_vset_error,
+    (const OSSL_CORE_HANDLE *prov,
+        uint32_t reason, const char *fmt, va_list args))
+#define OSSL_FUNC_CORE_SET_ERROR_MARK 8
 OSSL_CORE_MAKE_FUNC(int, core_set_error_mark, (const OSSL_CORE_HANDLE *prov))
-# define OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK  9
+#define OSSL_FUNC_CORE_CLEAR_LAST_ERROR_MARK 9
 OSSL_CORE_MAKE_FUNC(int, core_clear_last_error_mark,
-                    (const OSSL_CORE_HANDLE *prov))
-# define OSSL_FUNC_CORE_POP_ERROR_TO_MARK     10
+    (const OSSL_CORE_HANDLE *prov))
+#define OSSL_FUNC_CORE_POP_ERROR_TO_MARK 10
 OSSL_CORE_MAKE_FUNC(int, core_pop_error_to_mark, (const OSSL_CORE_HANDLE *prov))
 
-
 /* Functions to access the OBJ database */
 
-#define OSSL_FUNC_CORE_OBJ_ADD_SIGID          11
-#define OSSL_FUNC_CORE_OBJ_CREATE             12
+#define OSSL_FUNC_CORE_OBJ_ADD_SIGID 11
+#define OSSL_FUNC_CORE_OBJ_CREATE 12
 
 OSSL_CORE_MAKE_FUNC(int, core_obj_add_sigid,
-                    (const OSSL_CORE_HANDLE *prov, const char  *sign_name,
-                     const char *digest_name, const char *pkey_name))
+    (const OSSL_CORE_HANDLE *prov, const char *sign_name,
+        const char *digest_name, const char *pkey_name))
 OSSL_CORE_MAKE_FUNC(int, core_obj_create,
-                    (const OSSL_CORE_HANDLE *prov, const char *oid,
-                     const char *sn, const char *ln))
+    (const OSSL_CORE_HANDLE *prov, const char *oid,
+        const char *sn, const char *ln))
 
 /* Memory allocation, freeing, clearing. */
-#define OSSL_FUNC_CRYPTO_MALLOC               20
+#define OSSL_FUNC_CRYPTO_MALLOC 20
 OSSL_CORE_MAKE_FUNC(void *,
-        CRYPTO_malloc, (size_t num, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_ZALLOC               21
+    CRYPTO_malloc, (size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_ZALLOC 21
 OSSL_CORE_MAKE_FUNC(void *,
-        CRYPTO_zalloc, (size_t num, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_FREE                 22
+    CRYPTO_zalloc, (size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_FREE 22
 OSSL_CORE_MAKE_FUNC(void,
-        CRYPTO_free, (void *ptr, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_CLEAR_FREE           23
+    CRYPTO_free, (void *ptr, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_CLEAR_FREE 23
 OSSL_CORE_MAKE_FUNC(void,
-        CRYPTO_clear_free, (void *ptr, size_t num, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_REALLOC              24
+    CRYPTO_clear_free, (void *ptr, size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_REALLOC 24
 OSSL_CORE_MAKE_FUNC(void *,
-        CRYPTO_realloc, (void *addr, size_t num, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_CLEAR_REALLOC        25
+    CRYPTO_realloc, (void *addr, size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_CLEAR_REALLOC 25
 OSSL_CORE_MAKE_FUNC(void *,
-        CRYPTO_clear_realloc, (void *addr, size_t old_num, size_t num,
-                               const char *file, int line))
-#define OSSL_FUNC_CRYPTO_SECURE_MALLOC        26
+    CRYPTO_clear_realloc, (void *addr, size_t old_num, size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_SECURE_MALLOC 26
 OSSL_CORE_MAKE_FUNC(void *,
-        CRYPTO_secure_malloc, (size_t num, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_SECURE_ZALLOC        27
+    CRYPTO_secure_malloc, (size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_SECURE_ZALLOC 27
 OSSL_CORE_MAKE_FUNC(void *,
-        CRYPTO_secure_zalloc, (size_t num, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_SECURE_FREE          28
+    CRYPTO_secure_zalloc, (size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_SECURE_FREE 28
 OSSL_CORE_MAKE_FUNC(void,
-        CRYPTO_secure_free, (void *ptr, const char *file, int line))
-#define OSSL_FUNC_CRYPTO_SECURE_CLEAR_FREE    29
+    CRYPTO_secure_free, (void *ptr, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_SECURE_CLEAR_FREE 29
 OSSL_CORE_MAKE_FUNC(void,
-        CRYPTO_secure_clear_free, (void *ptr, size_t num, const char *file,
-                                   int line))
-#define OSSL_FUNC_CRYPTO_SECURE_ALLOCATED     30
+    CRYPTO_secure_clear_free, (void *ptr, size_t num, const char *file, int line))
+#define OSSL_FUNC_CRYPTO_SECURE_ALLOCATED 30
 OSSL_CORE_MAKE_FUNC(int,
-        CRYPTO_secure_allocated, (const void *ptr))
-#define OSSL_FUNC_OPENSSL_CLEANSE             31
+    CRYPTO_secure_allocated, (const void *ptr))
+#define OSSL_FUNC_OPENSSL_CLEANSE 31
 OSSL_CORE_MAKE_FUNC(void,
-        OPENSSL_cleanse, (void *ptr, size_t len))
+    OPENSSL_cleanse, (void *ptr, size_t len))
 
 /* Bio functions provided by the core */
-#define OSSL_FUNC_BIO_NEW_FILE                40
-#define OSSL_FUNC_BIO_NEW_MEMBUF              41
-#define OSSL_FUNC_BIO_READ_EX                 42
-#define OSSL_FUNC_BIO_WRITE_EX                43
-#define OSSL_FUNC_BIO_UP_REF                  44
-#define OSSL_FUNC_BIO_FREE                    45
-#define OSSL_FUNC_BIO_VPRINTF                 46
-#define OSSL_FUNC_BIO_VSNPRINTF               47
-#define OSSL_FUNC_BIO_PUTS                    48
-#define OSSL_FUNC_BIO_GETS                    49
-#define OSSL_FUNC_BIO_CTRL                    50
+#define OSSL_FUNC_BIO_NEW_FILE 40
+#define OSSL_FUNC_BIO_NEW_MEMBUF 41
+#define OSSL_FUNC_BIO_READ_EX 42
+#define OSSL_FUNC_BIO_WRITE_EX 43
+#define OSSL_FUNC_BIO_UP_REF 44
+#define OSSL_FUNC_BIO_FREE 45
+#define OSSL_FUNC_BIO_VPRINTF 46
+#define OSSL_FUNC_BIO_VSNPRINTF 47
+#define OSSL_FUNC_BIO_PUTS 48
+#define OSSL_FUNC_BIO_GETS 49
+#define OSSL_FUNC_BIO_CTRL 50
 
-
-OSSL_CORE_MAKE_FUNC(OSSL_CORE_BIO *, BIO_new_file, (const char *filename,
-                                                    const char *mode))
+OSSL_CORE_MAKE_FUNC(OSSL_CORE_BIO *, BIO_new_file, (const char *filename, const char *mode))
 OSSL_CORE_MAKE_FUNC(OSSL_CORE_BIO *, BIO_new_membuf, (const void *buf, int len))
-OSSL_CORE_MAKE_FUNC(int, BIO_read_ex, (OSSL_CORE_BIO *bio, void *data,
-                                       size_t data_len, size_t *bytes_read))
-OSSL_CORE_MAKE_FUNC(int, BIO_write_ex, (OSSL_CORE_BIO *bio, const void *data,
-                                        size_t data_len, size_t *written))
-OSSL_CORE_MAKE_FUNC(int, BIO_gets, (OSSL_CORE_BIO *bio, char *buf, int size))
-OSSL_CORE_MAKE_FUNC(int, BIO_puts, (OSSL_CORE_BIO *bio, const char *str))
-OSSL_CORE_MAKE_FUNC(int, BIO_up_ref, (OSSL_CORE_BIO *bio))
-OSSL_CORE_MAKE_FUNC(int, BIO_free, (OSSL_CORE_BIO *bio))
-OSSL_CORE_MAKE_FUNC(int, BIO_vprintf, (OSSL_CORE_BIO *bio, const char *format,
-                                       va_list args))
+OSSL_CORE_MAKE_FUNC(int, BIO_read_ex, (OSSL_CORE_BIO * bio, void *data, size_t data_len, size_t *bytes_read))
+OSSL_CORE_MAKE_FUNC(int, BIO_write_ex, (OSSL_CORE_BIO * bio, const void *data, size_t data_len, size_t *written))
+OSSL_CORE_MAKE_FUNC(int, BIO_gets, (OSSL_CORE_BIO * bio, char *buf, int size))
+OSSL_CORE_MAKE_FUNC(int, BIO_puts, (OSSL_CORE_BIO * bio, const char *str))
+OSSL_CORE_MAKE_FUNC(int, BIO_up_ref, (OSSL_CORE_BIO * bio))
+OSSL_CORE_MAKE_FUNC(int, BIO_free, (OSSL_CORE_BIO * bio))
+OSSL_CORE_MAKE_FUNC(int, BIO_vprintf, (OSSL_CORE_BIO * bio, const char *format, va_list args))
 OSSL_CORE_MAKE_FUNC(int, BIO_vsnprintf,
-                   (char *buf, size_t n, const char *fmt, va_list args))
-OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO *bio,
-                                    int cmd, long num, void *ptr))
+    (char *buf, size_t n, const char *fmt, va_list args))
+OSSL_CORE_MAKE_FUNC(int, BIO_ctrl, (OSSL_CORE_BIO * bio, int cmd, long num, void *ptr))
 
 /* New seeding functions prototypes with the 101-104 series */
-#define OSSL_FUNC_CLEANUP_USER_ENTROPY        96
-#define OSSL_FUNC_CLEANUP_USER_NONCE          97
-#define OSSL_FUNC_GET_USER_ENTROPY            98
-#define OSSL_FUNC_GET_USER_NONCE              99
+#define OSSL_FUNC_CLEANUP_USER_ENTROPY 96
+#define OSSL_FUNC_CLEANUP_USER_NONCE 97
+#define OSSL_FUNC_GET_USER_ENTROPY 98
+#define OSSL_FUNC_GET_USER_NONCE 99
 
-#define OSSL_FUNC_INDICATOR_CB                95
-OSSL_CORE_MAKE_FUNC(void, indicator_cb, (OPENSSL_CORE_CTX *ctx,
-                                         OSSL_INDICATOR_CALLBACK **cb))
-#define OSSL_FUNC_SELF_TEST_CB               100
-OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX *ctx, OSSL_CALLBACK **cb,
-                                         void **cbarg))
+#define OSSL_FUNC_INDICATOR_CB 95
+OSSL_CORE_MAKE_FUNC(void, indicator_cb, (OPENSSL_CORE_CTX * ctx, OSSL_INDICATOR_CALLBACK **cb))
+#define OSSL_FUNC_SELF_TEST_CB 100
+OSSL_CORE_MAKE_FUNC(void, self_test_cb, (OPENSSL_CORE_CTX * ctx, OSSL_CALLBACK **cb, void **cbarg))
 
 /* Functions to get seed material from the operating system */
-#define OSSL_FUNC_GET_ENTROPY                101
-#define OSSL_FUNC_CLEANUP_ENTROPY            102
-#define OSSL_FUNC_GET_NONCE                  103
-#define OSSL_FUNC_CLEANUP_NONCE              104
-OSSL_CORE_MAKE_FUNC(size_t, get_entropy, (const OSSL_CORE_HANDLE *handle,
-                                          unsigned char **pout, int entropy,
-                                          size_t min_len, size_t max_len))
-OSSL_CORE_MAKE_FUNC(size_t, get_user_entropy, (const OSSL_CORE_HANDLE *handle,
-                                               unsigned char **pout, int entropy,
-                                               size_t min_len, size_t max_len))
-OSSL_CORE_MAKE_FUNC(void, cleanup_entropy, (const OSSL_CORE_HANDLE *handle,
-                                            unsigned char *buf, size_t len))
-OSSL_CORE_MAKE_FUNC(void, cleanup_user_entropy, (const OSSL_CORE_HANDLE *handle,
-                                                 unsigned char *buf, size_t len))
-OSSL_CORE_MAKE_FUNC(size_t, get_nonce, (const OSSL_CORE_HANDLE *handle,
-                                        unsigned char **pout, size_t min_len,
-                                        size_t max_len, const void *salt,
-                                        size_t salt_len))
-OSSL_CORE_MAKE_FUNC(size_t, get_user_nonce, (const OSSL_CORE_HANDLE *handle,
-                                             unsigned char **pout, size_t min_len,
-                                             size_t max_len, const void *salt,
-                                             size_t salt_len))
-OSSL_CORE_MAKE_FUNC(void, cleanup_nonce, (const OSSL_CORE_HANDLE *handle,
-                                          unsigned char *buf, size_t len))
-OSSL_CORE_MAKE_FUNC(void, cleanup_user_nonce, (const OSSL_CORE_HANDLE *handle,
-                                               unsigned char *buf, size_t len))
+#define OSSL_FUNC_GET_ENTROPY 101
+#define OSSL_FUNC_CLEANUP_ENTROPY 102
+#define OSSL_FUNC_GET_NONCE 103
+#define OSSL_FUNC_CLEANUP_NONCE 104
+OSSL_CORE_MAKE_FUNC(size_t, get_entropy, (const OSSL_CORE_HANDLE *handle, unsigned char **pout, int entropy, size_t min_len, size_t max_len))
+OSSL_CORE_MAKE_FUNC(size_t, get_user_entropy, (const OSSL_CORE_HANDLE *handle, unsigned char **pout, int entropy, size_t min_len, size_t max_len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_entropy, (const OSSL_CORE_HANDLE *handle, unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_user_entropy, (const OSSL_CORE_HANDLE *handle, unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(size_t, get_nonce, (const OSSL_CORE_HANDLE *handle, unsigned char **pout, size_t min_len, size_t max_len, const void *salt, size_t salt_len))
+OSSL_CORE_MAKE_FUNC(size_t, get_user_nonce, (const OSSL_CORE_HANDLE *handle, unsigned char **pout, size_t min_len, size_t max_len, const void *salt, size_t salt_len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_nonce, (const OSSL_CORE_HANDLE *handle, unsigned char *buf, size_t len))
+OSSL_CORE_MAKE_FUNC(void, cleanup_user_nonce, (const OSSL_CORE_HANDLE *handle, unsigned char *buf, size_t len))
 
 /* Functions to access the core's providers */
-#define OSSL_FUNC_PROVIDER_REGISTER_CHILD_CB   105
+#define OSSL_FUNC_PROVIDER_REGISTER_CHILD_CB 105
 #define OSSL_FUNC_PROVIDER_DEREGISTER_CHILD_CB 106
-#define OSSL_FUNC_PROVIDER_NAME                107
-#define OSSL_FUNC_PROVIDER_GET0_PROVIDER_CTX   108
-#define OSSL_FUNC_PROVIDER_GET0_DISPATCH       109
-#define OSSL_FUNC_PROVIDER_UP_REF              110
-#define OSSL_FUNC_PROVIDER_FREE                111
+#define OSSL_FUNC_PROVIDER_NAME 107
+#define OSSL_FUNC_PROVIDER_GET0_PROVIDER_CTX 108
+#define OSSL_FUNC_PROVIDER_GET0_DISPATCH 109
+#define OSSL_FUNC_PROVIDER_UP_REF 110
+#define OSSL_FUNC_PROVIDER_FREE 111
 
 OSSL_CORE_MAKE_FUNC(int, provider_register_child_cb,
-                    (const OSSL_CORE_HANDLE *handle,
-                     int (*create_cb)(const OSSL_CORE_HANDLE *provider, void *cbdata),
-                     int (*remove_cb)(const OSSL_CORE_HANDLE *provider, void *cbdata),
-                     int (*global_props_cb)(const char *props, void *cbdata),
-                     void *cbdata))
+    (const OSSL_CORE_HANDLE *handle,
+        int (*create_cb)(const OSSL_CORE_HANDLE *provider, void *cbdata),
+        int (*remove_cb)(const OSSL_CORE_HANDLE *provider, void *cbdata),
+        int (*global_props_cb)(const char *props, void *cbdata),
+        void *cbdata))
 OSSL_CORE_MAKE_FUNC(void, provider_deregister_child_cb,
-                    (const OSSL_CORE_HANDLE *handle))
+    (const OSSL_CORE_HANDLE *handle))
 OSSL_CORE_MAKE_FUNC(const char *, provider_name,
-                    (const OSSL_CORE_HANDLE *prov))
+    (const OSSL_CORE_HANDLE *prov))
 OSSL_CORE_MAKE_FUNC(void *, provider_get0_provider_ctx,
-                    (const OSSL_CORE_HANDLE *prov))
+    (const OSSL_CORE_HANDLE *prov))
 OSSL_CORE_MAKE_FUNC(const OSSL_DISPATCH *, provider_get0_dispatch,
-                    (const OSSL_CORE_HANDLE *prov))
+    (const OSSL_CORE_HANDLE *prov))
 OSSL_CORE_MAKE_FUNC(int, provider_up_ref,
-                    (const OSSL_CORE_HANDLE *prov, int activate))
+    (const OSSL_CORE_HANDLE *prov, int activate))
 OSSL_CORE_MAKE_FUNC(int, provider_free,
-                    (const OSSL_CORE_HANDLE *prov, int deactivate))
+    (const OSSL_CORE_HANDLE *prov, int deactivate))
 
 /* Additional error functions provided by the core */
-# define OSSL_FUNC_CORE_COUNT_TO_MARK          120
+#define OSSL_FUNC_CORE_COUNT_TO_MARK 120
 OSSL_CORE_MAKE_FUNC(int, core_count_to_mark, (const OSSL_CORE_HANDLE *prov))
 
 /* Functions provided by the provider to the Core, reserved numbers 1024-1535 */
-# define OSSL_FUNC_PROVIDER_TEARDOWN           1024
+#define OSSL_FUNC_PROVIDER_TEARDOWN 1024
 OSSL_CORE_MAKE_FUNC(void, provider_teardown, (void *provctx))
-# define OSSL_FUNC_PROVIDER_GETTABLE_PARAMS    1025
+#define OSSL_FUNC_PROVIDER_GETTABLE_PARAMS 1025
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,
-                    provider_gettable_params,(void *provctx))
-# define OSSL_FUNC_PROVIDER_GET_PARAMS         1026
-OSSL_CORE_MAKE_FUNC(int, provider_get_params, (void *provctx,
-                                               OSSL_PARAM params[]))
-# define OSSL_FUNC_PROVIDER_QUERY_OPERATION    1027
-OSSL_CORE_MAKE_FUNC(const OSSL_ALGORITHM *,provider_query_operation,
-                    (void *provctx, int operation_id, int *no_store))
-# define OSSL_FUNC_PROVIDER_UNQUERY_OPERATION  1028
+    provider_gettable_params, (void *provctx))
+#define OSSL_FUNC_PROVIDER_GET_PARAMS 1026
+OSSL_CORE_MAKE_FUNC(int, provider_get_params, (void *provctx, OSSL_PARAM params[]))
+#define OSSL_FUNC_PROVIDER_QUERY_OPERATION 1027
+OSSL_CORE_MAKE_FUNC(const OSSL_ALGORITHM *, provider_query_operation,
+    (void *provctx, int operation_id, int *no_store))
+#define OSSL_FUNC_PROVIDER_UNQUERY_OPERATION 1028
 OSSL_CORE_MAKE_FUNC(void, provider_unquery_operation,
-                    (void *provctx, int operation_id, const OSSL_ALGORITHM *))
-# define OSSL_FUNC_PROVIDER_GET_REASON_STRINGS 1029
-OSSL_CORE_MAKE_FUNC(const OSSL_ITEM *,provider_get_reason_strings,
-                    (void *provctx))
-# define OSSL_FUNC_PROVIDER_GET_CAPABILITIES   1030
-OSSL_CORE_MAKE_FUNC(int, provider_get_capabilities, (void *provctx,
-                    const char *capability, OSSL_CALLBACK *cb, void *arg))
-# define OSSL_FUNC_PROVIDER_SELF_TEST          1031
+    (void *provctx, int operation_id, const OSSL_ALGORITHM *))
+#define OSSL_FUNC_PROVIDER_GET_REASON_STRINGS 1029
+OSSL_CORE_MAKE_FUNC(const OSSL_ITEM *, provider_get_reason_strings,
+    (void *provctx))
+#define OSSL_FUNC_PROVIDER_GET_CAPABILITIES 1030
+OSSL_CORE_MAKE_FUNC(int, provider_get_capabilities, (void *provctx, const char *capability, OSSL_CALLBACK *cb, void *arg))
+#define OSSL_FUNC_PROVIDER_SELF_TEST 1031
 OSSL_CORE_MAKE_FUNC(int, provider_self_test, (void *provctx))
-# define OSSL_FUNC_PROVIDER_RANDOM_BYTES       1032
-OSSL_CORE_MAKE_FUNC(int, provider_random_bytes, (void *provctx, int which,
-                                                 void *buf, size_t n,
-                                                 unsigned int strength))
+#define OSSL_FUNC_PROVIDER_RANDOM_BYTES 1032
+OSSL_CORE_MAKE_FUNC(int, provider_random_bytes, (void *provctx, int which, void *buf, size_t n, unsigned int strength))
 
 /* Libssl related functions */
-#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND          2001
+#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_SEND 2001
 OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_crypto_send,
-                    (SSL *s, const unsigned char *buf, size_t buf_len,
-                     size_t *consumed, void *arg))
-#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD      2002
+    (SSL * s, const unsigned char *buf, size_t buf_len,
+        size_t *consumed, void *arg))
+#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RECV_RCD 2002
 OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_crypto_recv_rcd,
-                    (SSL *s, const unsigned char **buf, size_t *bytes_read,
-                     void *arg))
-#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD   2003
+    (SSL * s, const unsigned char **buf, size_t *bytes_read,
+        void *arg))
+#define OSSL_FUNC_SSL_QUIC_TLS_CRYPTO_RELEASE_RCD 2003
 OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_crypto_release_rcd,
-                    (SSL *s, size_t bytes_read, void *arg))
-#define OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET         2004
+    (SSL * s, size_t bytes_read, void *arg))
+#define OSSL_FUNC_SSL_QUIC_TLS_YIELD_SECRET 2004
 OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_yield_secret,
-                    (SSL *s, uint32_t prot_level, int direction,
-                     const unsigned char *secret, size_t secret_len, void *arg))
+    (SSL * s, uint32_t prot_level, int direction,
+        const unsigned char *secret, size_t secret_len, void *arg))
 #define OSSL_FUNC_SSL_QUIC_TLS_GOT_TRANSPORT_PARAMS 2005
 OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_got_transport_params,
-                    (SSL *s, const unsigned char *params, size_t params_len,
-                     void *arg))
-#define OSSL_FUNC_SSL_QUIC_TLS_ALERT                2006
+    (SSL * s, const unsigned char *params, size_t params_len,
+        void *arg))
+#define OSSL_FUNC_SSL_QUIC_TLS_ALERT 2006
 OSSL_CORE_MAKE_FUNC(int, SSL_QUIC_TLS_alert,
-                    (SSL *s, unsigned char alert_code, void *arg))
+    (SSL * s, unsigned char alert_code, void *arg))
 
 /* Operations */
 
-# define OSSL_OP_DIGEST                              1
-# define OSSL_OP_CIPHER                              2   /* Symmetric Ciphers */
-# define OSSL_OP_MAC                                 3
-# define OSSL_OP_KDF                                 4
-# define OSSL_OP_RAND                                5
-# define OSSL_OP_KEYMGMT                            10
-# define OSSL_OP_KEYEXCH                            11
-# define OSSL_OP_SIGNATURE                          12
-# define OSSL_OP_ASYM_CIPHER                        13
-# define OSSL_OP_KEM                                14
-# define OSSL_OP_SKEYMGMT                           15
+#define OSSL_OP_DIGEST 1
+#define OSSL_OP_CIPHER 2 /* Symmetric Ciphers */
+#define OSSL_OP_MAC 3
+#define OSSL_OP_KDF 4
+#define OSSL_OP_RAND 5
+#define OSSL_OP_KEYMGMT 10
+#define OSSL_OP_KEYEXCH 11
+#define OSSL_OP_SIGNATURE 12
+#define OSSL_OP_ASYM_CIPHER 13
+#define OSSL_OP_KEM 14
+#define OSSL_OP_SKEYMGMT 15
 /* New section for non-EVP operations */
-# define OSSL_OP_ENCODER                            20
-# define OSSL_OP_DECODER                            21
-# define OSSL_OP_STORE                              22
+#define OSSL_OP_ENCODER 20
+#define OSSL_OP_DECODER 21
+#define OSSL_OP_STORE 22
 /* Highest known operation number */
-# define OSSL_OP__HIGHEST                           22
+#define OSSL_OP__HIGHEST 22
 
 /* Digests */
 
-# define OSSL_FUNC_DIGEST_NEWCTX                     1
-# define OSSL_FUNC_DIGEST_INIT                       2
-# define OSSL_FUNC_DIGEST_UPDATE                     3
-# define OSSL_FUNC_DIGEST_FINAL                      4
-# define OSSL_FUNC_DIGEST_DIGEST                     5
-# define OSSL_FUNC_DIGEST_FREECTX                    6
-# define OSSL_FUNC_DIGEST_DUPCTX                     7
-# define OSSL_FUNC_DIGEST_GET_PARAMS                 8
-# define OSSL_FUNC_DIGEST_SET_CTX_PARAMS             9
-# define OSSL_FUNC_DIGEST_GET_CTX_PARAMS            10
-# define OSSL_FUNC_DIGEST_GETTABLE_PARAMS           11
-# define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS       12
-# define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS       13
-# define OSSL_FUNC_DIGEST_SQUEEZE                   14
-# define OSSL_FUNC_DIGEST_COPYCTX                   15
+#define OSSL_FUNC_DIGEST_NEWCTX 1
+#define OSSL_FUNC_DIGEST_INIT 2
+#define OSSL_FUNC_DIGEST_UPDATE 3
+#define OSSL_FUNC_DIGEST_FINAL 4
+#define OSSL_FUNC_DIGEST_DIGEST 5
+#define OSSL_FUNC_DIGEST_FREECTX 6
+#define OSSL_FUNC_DIGEST_DUPCTX 7
+#define OSSL_FUNC_DIGEST_GET_PARAMS 8
+#define OSSL_FUNC_DIGEST_SET_CTX_PARAMS 9
+#define OSSL_FUNC_DIGEST_GET_CTX_PARAMS 10
+#define OSSL_FUNC_DIGEST_GETTABLE_PARAMS 11
+#define OSSL_FUNC_DIGEST_SETTABLE_CTX_PARAMS 12
+#define OSSL_FUNC_DIGEST_GETTABLE_CTX_PARAMS 13
+#define OSSL_FUNC_DIGEST_SQUEEZE 14
+#define OSSL_FUNC_DIGEST_COPYCTX 15
 
 OSSL_CORE_MAKE_FUNC(void *, digest_newctx, (void *provctx))
 OSSL_CORE_MAKE_FUNC(int, digest_init, (void *dctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, digest_update,
-                    (void *dctx, const unsigned char *in, size_t inl))
+    (void *dctx, const unsigned char *in, size_t inl))
 OSSL_CORE_MAKE_FUNC(int, digest_final,
-                    (void *dctx,
-                     unsigned char *out, size_t *outl, size_t outsz))
+    (void *dctx,
+        unsigned char *out, size_t *outl, size_t outsz))
 OSSL_CORE_MAKE_FUNC(int, digest_squeeze,
-                    (void *dctx,
-                     unsigned char *out, size_t *outl, size_t outsz))
+    (void *dctx,
+        unsigned char *out, size_t *outl, size_t outsz))
 OSSL_CORE_MAKE_FUNC(int, digest_digest,
-                    (void *provctx, const unsigned char *in, size_t inl,
-                     unsigned char *out, size_t *outl, size_t outsz))
+    (void *provctx, const unsigned char *in, size_t inl,
+        unsigned char *out, size_t *outl, size_t outsz))
 
 OSSL_CORE_MAKE_FUNC(void, digest_freectx, (void *dctx))
 OSSL_CORE_MAKE_FUNC(void *, digest_dupctx, (void *dctx))
@@ -367,243 +336,221 @@ OSSL_CORE_MAKE_FUNC(void, digest_copyctx, (void *outctx, void *inctx))
 
 OSSL_CORE_MAKE_FUNC(int, digest_get_params, (OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, digest_set_ctx_params,
-                    (void *vctx, const OSSL_PARAM params[]))
+    (void *vctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, digest_get_ctx_params,
-                    (void *vctx, OSSL_PARAM params[]))
+    (void *vctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, digest_gettable_params,
-                    (void *provctx))
+    (void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, digest_settable_ctx_params,
-                    (void *dctx, void *provctx))
+    (void *dctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, digest_gettable_ctx_params,
-                    (void *dctx, void *provctx))
+    (void *dctx, void *provctx))
 
 /* Symmetric Ciphers */
 
-# define OSSL_FUNC_CIPHER_NEWCTX                     1
-# define OSSL_FUNC_CIPHER_ENCRYPT_INIT               2
-# define OSSL_FUNC_CIPHER_DECRYPT_INIT               3
-# define OSSL_FUNC_CIPHER_UPDATE                     4
-# define OSSL_FUNC_CIPHER_FINAL                      5
-# define OSSL_FUNC_CIPHER_CIPHER                     6
-# define OSSL_FUNC_CIPHER_FREECTX                    7
-# define OSSL_FUNC_CIPHER_DUPCTX                     8
-# define OSSL_FUNC_CIPHER_GET_PARAMS                 9
-# define OSSL_FUNC_CIPHER_GET_CTX_PARAMS            10
-# define OSSL_FUNC_CIPHER_SET_CTX_PARAMS            11
-# define OSSL_FUNC_CIPHER_GETTABLE_PARAMS           12
-# define OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS       13
-# define OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS       14
-# define OSSL_FUNC_CIPHER_PIPELINE_ENCRYPT_INIT     15
-# define OSSL_FUNC_CIPHER_PIPELINE_DECRYPT_INIT     16
-# define OSSL_FUNC_CIPHER_PIPELINE_UPDATE           17
-# define OSSL_FUNC_CIPHER_PIPELINE_FINAL            18
-# define OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT         19
-# define OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT         20
+#define OSSL_FUNC_CIPHER_NEWCTX 1
+#define OSSL_FUNC_CIPHER_ENCRYPT_INIT 2
+#define OSSL_FUNC_CIPHER_DECRYPT_INIT 3
+#define OSSL_FUNC_CIPHER_UPDATE 4
+#define OSSL_FUNC_CIPHER_FINAL 5
+#define OSSL_FUNC_CIPHER_CIPHER 6
+#define OSSL_FUNC_CIPHER_FREECTX 7
+#define OSSL_FUNC_CIPHER_DUPCTX 8
+#define OSSL_FUNC_CIPHER_GET_PARAMS 9
+#define OSSL_FUNC_CIPHER_GET_CTX_PARAMS 10
+#define OSSL_FUNC_CIPHER_SET_CTX_PARAMS 11
+#define OSSL_FUNC_CIPHER_GETTABLE_PARAMS 12
+#define OSSL_FUNC_CIPHER_GETTABLE_CTX_PARAMS 13
+#define OSSL_FUNC_CIPHER_SETTABLE_CTX_PARAMS 14
+#define OSSL_FUNC_CIPHER_PIPELINE_ENCRYPT_INIT 15
+#define OSSL_FUNC_CIPHER_PIPELINE_DECRYPT_INIT 16
+#define OSSL_FUNC_CIPHER_PIPELINE_UPDATE 17
+#define OSSL_FUNC_CIPHER_PIPELINE_FINAL 18
+#define OSSL_FUNC_CIPHER_ENCRYPT_SKEY_INIT 19
+#define OSSL_FUNC_CIPHER_DECRYPT_SKEY_INIT 20
 
 OSSL_CORE_MAKE_FUNC(void *, cipher_newctx, (void *provctx))
-OSSL_CORE_MAKE_FUNC(int, cipher_encrypt_init, (void *cctx,
-                                                  const unsigned char *key,
-                                                  size_t keylen,
-                                                  const unsigned char *iv,
-                                                  size_t ivlen,
-                                                  const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, cipher_decrypt_init, (void *cctx,
-                                                  const unsigned char *key,
-                                                  size_t keylen,
-                                                  const unsigned char *iv,
-                                                  size_t ivlen,
-                                                  const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, cipher_encrypt_init, (void *cctx, const unsigned char *key, size_t keylen, const unsigned char *iv, size_t ivlen, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, cipher_decrypt_init, (void *cctx, const unsigned char *key, size_t keylen, const unsigned char *iv, size_t ivlen, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, cipher_update,
-                    (void *cctx,
-                     unsigned char *out, size_t *outl, size_t outsize,
-                     const unsigned char *in, size_t inl))
+    (void *cctx,
+        unsigned char *out, size_t *outl, size_t outsize,
+        const unsigned char *in, size_t inl))
 OSSL_CORE_MAKE_FUNC(int, cipher_final,
-                    (void *cctx,
-                     unsigned char *out, size_t *outl, size_t outsize))
+    (void *cctx,
+        unsigned char *out, size_t *outl, size_t outsize))
 OSSL_CORE_MAKE_FUNC(int, cipher_cipher,
-                    (void *cctx,
-                     unsigned char *out, size_t *outl, size_t outsize,
-                     const unsigned char *in, size_t inl))
+    (void *cctx,
+        unsigned char *out, size_t *outl, size_t outsize,
+        const unsigned char *in, size_t inl))
 OSSL_CORE_MAKE_FUNC(int, cipher_pipeline_encrypt_init,
-                    (void *cctx,
-                     const unsigned char *key, size_t keylen,
-                     size_t numpipes, const unsigned char **iv, size_t ivlen,
-                     const OSSL_PARAM params[]))
+    (void *cctx,
+        const unsigned char *key, size_t keylen,
+        size_t numpipes, const unsigned char **iv, size_t ivlen,
+        const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, cipher_pipeline_decrypt_init,
-                    (void *cctx,
-                     const unsigned char *key, size_t keylen,
-                     size_t numpipes, const unsigned char **iv, size_t ivlen,
-                     const OSSL_PARAM params[]))
+    (void *cctx,
+        const unsigned char *key, size_t keylen,
+        size_t numpipes, const unsigned char **iv, size_t ivlen,
+        const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, cipher_pipeline_update,
-                    (void *cctx, size_t numpipes,
-                     unsigned char **out, size_t *outl, const size_t *outsize,
-                     const unsigned char **in, const size_t *inl))
+    (void *cctx, size_t numpipes,
+        unsigned char **out, size_t *outl, const size_t *outsize,
+        const unsigned char **in, const size_t *inl))
 OSSL_CORE_MAKE_FUNC(int, cipher_pipeline_final,
-                    (void *cctx, size_t numpipes,
-                     unsigned char **out, size_t *outl, const size_t *outsize))
+    (void *cctx, size_t numpipes,
+        unsigned char **out, size_t *outl, const size_t *outsize))
 OSSL_CORE_MAKE_FUNC(void, cipher_freectx, (void *cctx))
 OSSL_CORE_MAKE_FUNC(void *, cipher_dupctx, (void *cctx))
 OSSL_CORE_MAKE_FUNC(int, cipher_get_params, (OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, cipher_get_ctx_params, (void *cctx,
-                                                    OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, cipher_set_ctx_params, (void *cctx,
-                                                    const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, cipher_get_ctx_params, (void *cctx, OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, cipher_set_ctx_params, (void *cctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_gettable_params,
-                    (void *provctx))
+    (void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_settable_ctx_params,
-                    (void *cctx, void *provctx))
+    (void *cctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_gettable_ctx_params,
-                    (void *cctx, void *provctx))
-OSSL_CORE_MAKE_FUNC(int, cipher_encrypt_skey_init, (void *cctx,
-                                                    void *skeydata,
-                                                    const unsigned char *iv,
-                                                    size_t ivlen,
-                                                    const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, cipher_decrypt_skey_init, (void *cctx,
-                                                    void *skeydata,
-                                                    const unsigned char *iv,
-                                                    size_t ivlen,
-                                                    const OSSL_PARAM params[]))
+    (void *cctx, void *provctx))
+OSSL_CORE_MAKE_FUNC(int, cipher_encrypt_skey_init, (void *cctx, void *skeydata, const unsigned char *iv, size_t ivlen, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, cipher_decrypt_skey_init, (void *cctx, void *skeydata, const unsigned char *iv, size_t ivlen, const OSSL_PARAM params[]))
 
 /* MACs */
 
-# define OSSL_FUNC_MAC_NEWCTX                        1
-# define OSSL_FUNC_MAC_DUPCTX                        2
-# define OSSL_FUNC_MAC_FREECTX                       3
-# define OSSL_FUNC_MAC_INIT                          4
-# define OSSL_FUNC_MAC_UPDATE                        5
-# define OSSL_FUNC_MAC_FINAL                         6
-# define OSSL_FUNC_MAC_GET_PARAMS                    7
-# define OSSL_FUNC_MAC_GET_CTX_PARAMS                8
-# define OSSL_FUNC_MAC_SET_CTX_PARAMS                9
-# define OSSL_FUNC_MAC_GETTABLE_PARAMS              10
-# define OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS          11
-# define OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS          12
-# define OSSL_FUNC_MAC_INIT_SKEY                    13
+#define OSSL_FUNC_MAC_NEWCTX 1
+#define OSSL_FUNC_MAC_DUPCTX 2
+#define OSSL_FUNC_MAC_FREECTX 3
+#define OSSL_FUNC_MAC_INIT 4
+#define OSSL_FUNC_MAC_UPDATE 5
+#define OSSL_FUNC_MAC_FINAL 6
+#define OSSL_FUNC_MAC_GET_PARAMS 7
+#define OSSL_FUNC_MAC_GET_CTX_PARAMS 8
+#define OSSL_FUNC_MAC_SET_CTX_PARAMS 9
+#define OSSL_FUNC_MAC_GETTABLE_PARAMS 10
+#define OSSL_FUNC_MAC_GETTABLE_CTX_PARAMS 11
+#define OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS 12
+#define OSSL_FUNC_MAC_INIT_SKEY 13
 
 OSSL_CORE_MAKE_FUNC(void *, mac_newctx, (void *provctx))
 OSSL_CORE_MAKE_FUNC(void *, mac_dupctx, (void *src))
 OSSL_CORE_MAKE_FUNC(void, mac_freectx, (void *mctx))
-OSSL_CORE_MAKE_FUNC(int, mac_init, (void *mctx, const unsigned char *key,
-                                    size_t keylen, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, mac_init, (void *mctx, const unsigned char *key, size_t keylen, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, mac_update,
-                    (void *mctx, const unsigned char *in, size_t inl))
+    (void *mctx, const unsigned char *in, size_t inl))
 OSSL_CORE_MAKE_FUNC(int, mac_final,
-                    (void *mctx,
-                     unsigned char *out, size_t *outl, size_t outsize))
+    (void *mctx,
+        unsigned char *out, size_t *outl, size_t outsize))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, mac_gettable_params, (void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, mac_gettable_ctx_params,
-                    (void *mctx, void *provctx))
+    (void *mctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, mac_settable_ctx_params,
-                    (void *mctx, void *provctx))
+    (void *mctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, mac_get_params, (OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, mac_get_ctx_params,
-                    (void *mctx, OSSL_PARAM params[]))
+    (void *mctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, mac_set_ctx_params,
-                    (void *mctx, const OSSL_PARAM params[]))
+    (void *mctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, mac_init_skey, (void *mctx, void *key, const OSSL_PARAM params[]))
 
 /* KDFs and PRFs */
 
-# define OSSL_FUNC_KDF_NEWCTX                        1
-# define OSSL_FUNC_KDF_DUPCTX                        2
-# define OSSL_FUNC_KDF_FREECTX                       3
-# define OSSL_FUNC_KDF_RESET                         4
-# define OSSL_FUNC_KDF_DERIVE                        5
-# define OSSL_FUNC_KDF_GETTABLE_PARAMS               6
-# define OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS           7
-# define OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS           8
-# define OSSL_FUNC_KDF_GET_PARAMS                    9
-# define OSSL_FUNC_KDF_GET_CTX_PARAMS               10
-# define OSSL_FUNC_KDF_SET_CTX_PARAMS               11
+#define OSSL_FUNC_KDF_NEWCTX 1
+#define OSSL_FUNC_KDF_DUPCTX 2
+#define OSSL_FUNC_KDF_FREECTX 3
+#define OSSL_FUNC_KDF_RESET 4
+#define OSSL_FUNC_KDF_DERIVE 5
+#define OSSL_FUNC_KDF_GETTABLE_PARAMS 6
+#define OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS 7
+#define OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS 8
+#define OSSL_FUNC_KDF_GET_PARAMS 9
+#define OSSL_FUNC_KDF_GET_CTX_PARAMS 10
+#define OSSL_FUNC_KDF_SET_CTX_PARAMS 11
 
 OSSL_CORE_MAKE_FUNC(void *, kdf_newctx, (void *provctx))
 OSSL_CORE_MAKE_FUNC(void *, kdf_dupctx, (void *src))
 OSSL_CORE_MAKE_FUNC(void, kdf_freectx, (void *kctx))
 OSSL_CORE_MAKE_FUNC(void, kdf_reset, (void *kctx))
-OSSL_CORE_MAKE_FUNC(int, kdf_derive, (void *kctx, unsigned char *key,
-                                      size_t keylen, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, kdf_derive, (void *kctx, unsigned char *key, size_t keylen, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kdf_gettable_params, (void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kdf_gettable_ctx_params,
-                    (void *kctx, void *provctx))
+    (void *kctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kdf_settable_ctx_params,
-                    (void *kctx, void *provctx))
+    (void *kctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, kdf_get_params, (OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, kdf_get_ctx_params,
-                    (void *kctx, OSSL_PARAM params[]))
+    (void *kctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, kdf_set_ctx_params,
-                    (void *kctx, const OSSL_PARAM params[]))
+    (void *kctx, const OSSL_PARAM params[]))
 
 /* RAND */
 
-# define OSSL_FUNC_RAND_NEWCTX                        1
-# define OSSL_FUNC_RAND_FREECTX                       2
-# define OSSL_FUNC_RAND_INSTANTIATE                   3
-# define OSSL_FUNC_RAND_UNINSTANTIATE                 4
-# define OSSL_FUNC_RAND_GENERATE                      5
-# define OSSL_FUNC_RAND_RESEED                        6
-# define OSSL_FUNC_RAND_NONCE                         7
-# define OSSL_FUNC_RAND_ENABLE_LOCKING                8
-# define OSSL_FUNC_RAND_LOCK                          9
-# define OSSL_FUNC_RAND_UNLOCK                       10
-# define OSSL_FUNC_RAND_GETTABLE_PARAMS              11
-# define OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS          12
-# define OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS          13
-# define OSSL_FUNC_RAND_GET_PARAMS                   14
-# define OSSL_FUNC_RAND_GET_CTX_PARAMS               15
-# define OSSL_FUNC_RAND_SET_CTX_PARAMS               16
-# define OSSL_FUNC_RAND_VERIFY_ZEROIZATION           17
-# define OSSL_FUNC_RAND_GET_SEED                     18
-# define OSSL_FUNC_RAND_CLEAR_SEED                   19
+#define OSSL_FUNC_RAND_NEWCTX 1
+#define OSSL_FUNC_RAND_FREECTX 2
+#define OSSL_FUNC_RAND_INSTANTIATE 3
+#define OSSL_FUNC_RAND_UNINSTANTIATE 4
+#define OSSL_FUNC_RAND_GENERATE 5
+#define OSSL_FUNC_RAND_RESEED 6
+#define OSSL_FUNC_RAND_NONCE 7
+#define OSSL_FUNC_RAND_ENABLE_LOCKING 8
+#define OSSL_FUNC_RAND_LOCK 9
+#define OSSL_FUNC_RAND_UNLOCK 10
+#define OSSL_FUNC_RAND_GETTABLE_PARAMS 11
+#define OSSL_FUNC_RAND_GETTABLE_CTX_PARAMS 12
+#define OSSL_FUNC_RAND_SETTABLE_CTX_PARAMS 13
+#define OSSL_FUNC_RAND_GET_PARAMS 14
+#define OSSL_FUNC_RAND_GET_CTX_PARAMS 15
+#define OSSL_FUNC_RAND_SET_CTX_PARAMS 16
+#define OSSL_FUNC_RAND_VERIFY_ZEROIZATION 17
+#define OSSL_FUNC_RAND_GET_SEED 18
+#define OSSL_FUNC_RAND_CLEAR_SEED 19
 
-OSSL_CORE_MAKE_FUNC(void *,rand_newctx,
-                    (void *provctx, void *parent,
-                    const OSSL_DISPATCH *parent_calls))
-OSSL_CORE_MAKE_FUNC(void,rand_freectx, (void *vctx))
-OSSL_CORE_MAKE_FUNC(int,rand_instantiate,
-                    (void *vdrbg, unsigned int strength,
-                     int prediction_resistance,
-                     const unsigned char *pstr, size_t pstr_len,
-                     const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int,rand_uninstantiate, (void *vdrbg))
-OSSL_CORE_MAKE_FUNC(int,rand_generate,
-                    (void *vctx, unsigned char *out, size_t outlen,
-                     unsigned int strength, int prediction_resistance,
-                     const unsigned char *addin, size_t addin_len))
-OSSL_CORE_MAKE_FUNC(int,rand_reseed,
-                    (void *vctx, int prediction_resistance,
-                     const unsigned char *ent, size_t ent_len,
-                     const unsigned char *addin, size_t addin_len))
-OSSL_CORE_MAKE_FUNC(size_t,rand_nonce,
-                    (void *vctx, unsigned char *out, unsigned int strength,
-                     size_t min_noncelen, size_t max_noncelen))
-OSSL_CORE_MAKE_FUNC(int,rand_enable_locking, (void *vctx))
-OSSL_CORE_MAKE_FUNC(int,rand_lock, (void *vctx))
-OSSL_CORE_MAKE_FUNC(void,rand_unlock, (void *vctx))
-OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,rand_gettable_params, (void *provctx))
-OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,rand_gettable_ctx_params,
-                    (void *vctx, void *provctx))
-OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,rand_settable_ctx_params,
-                    (void *vctx, void *provctx))
-OSSL_CORE_MAKE_FUNC(int,rand_get_params, (OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int,rand_get_ctx_params,
-                    (void *vctx, OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int,rand_set_ctx_params,
-                    (void *vctx, const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(void,rand_set_callbacks,
-                    (void *vctx, OSSL_INOUT_CALLBACK *get_entropy,
-                     OSSL_CALLBACK *cleanup_entropy,
-                     OSSL_INOUT_CALLBACK *get_nonce,
-                     OSSL_CALLBACK *cleanup_nonce, void *arg))
-OSSL_CORE_MAKE_FUNC(int,rand_verify_zeroization,
-                    (void *vctx))
-OSSL_CORE_MAKE_FUNC(size_t,rand_get_seed,
-                    (void *vctx, unsigned char **buffer,
-                     int entropy, size_t min_len, size_t max_len,
-                     int prediction_resistance,
-                     const unsigned char *adin, size_t adin_len))
-OSSL_CORE_MAKE_FUNC(void,rand_clear_seed,
-                    (void *vctx, unsigned char *buffer, size_t b_len))
+OSSL_CORE_MAKE_FUNC(void *, rand_newctx,
+    (void *provctx, void *parent,
+        const OSSL_DISPATCH *parent_calls))
+OSSL_CORE_MAKE_FUNC(void, rand_freectx, (void *vctx))
+OSSL_CORE_MAKE_FUNC(int, rand_instantiate,
+    (void *vdrbg, unsigned int strength,
+        int prediction_resistance,
+        const unsigned char *pstr, size_t pstr_len,
+        const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, rand_uninstantiate, (void *vdrbg))
+OSSL_CORE_MAKE_FUNC(int, rand_generate,
+    (void *vctx, unsigned char *out, size_t outlen,
+        unsigned int strength, int prediction_resistance,
+        const unsigned char *addin, size_t addin_len))
+OSSL_CORE_MAKE_FUNC(int, rand_reseed,
+    (void *vctx, int prediction_resistance,
+        const unsigned char *ent, size_t ent_len,
+        const unsigned char *addin, size_t addin_len))
+OSSL_CORE_MAKE_FUNC(size_t, rand_nonce,
+    (void *vctx, unsigned char *out, unsigned int strength,
+        size_t min_noncelen, size_t max_noncelen))
+OSSL_CORE_MAKE_FUNC(int, rand_enable_locking, (void *vctx))
+OSSL_CORE_MAKE_FUNC(int, rand_lock, (void *vctx))
+OSSL_CORE_MAKE_FUNC(void, rand_unlock, (void *vctx))
+OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, rand_gettable_params, (void *provctx))
+OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, rand_gettable_ctx_params,
+    (void *vctx, void *provctx))
+OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, rand_settable_ctx_params,
+    (void *vctx, void *provctx))
+OSSL_CORE_MAKE_FUNC(int, rand_get_params, (OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, rand_get_ctx_params,
+    (void *vctx, OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, rand_set_ctx_params,
+    (void *vctx, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(void, rand_set_callbacks,
+    (void *vctx, OSSL_INOUT_CALLBACK *get_entropy,
+        OSSL_CALLBACK *cleanup_entropy,
+        OSSL_INOUT_CALLBACK *get_nonce,
+        OSSL_CALLBACK *cleanup_nonce, void *arg))
+OSSL_CORE_MAKE_FUNC(int, rand_verify_zeroization,
+    (void *vctx))
+OSSL_CORE_MAKE_FUNC(size_t, rand_get_seed,
+    (void *vctx, unsigned char **buffer,
+        int entropy, size_t min_len, size_t max_len,
+        int prediction_resistance,
+        const unsigned char *adin, size_t adin_len))
+OSSL_CORE_MAKE_FUNC(void, rand_clear_seed,
+    (void *vctx, unsigned char *buffer, size_t b_len))
 
 /*-
  * Key management
@@ -641,266 +588,251 @@ OSSL_CORE_MAKE_FUNC(void,rand_clear_seed,
  */
 
 /* Key data subset selection - individual bits */
-# define OSSL_KEYMGMT_SELECT_PRIVATE_KEY            0x01
-# define OSSL_KEYMGMT_SELECT_PUBLIC_KEY             0x02
-# define OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS      0x04
-# define OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS       0x80
+#define OSSL_KEYMGMT_SELECT_PRIVATE_KEY 0x01
+#define OSSL_KEYMGMT_SELECT_PUBLIC_KEY 0x02
+#define OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS 0x04
+#define OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS 0x80
 
 /* Key data subset selection - combinations */
-# define OSSL_KEYMGMT_SELECT_ALL_PARAMETERS     \
-    ( OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS     \
-      | OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS)
-# define OSSL_KEYMGMT_SELECT_KEYPAIR            \
-    ( OSSL_KEYMGMT_SELECT_PRIVATE_KEY | OSSL_KEYMGMT_SELECT_PUBLIC_KEY )
-# define OSSL_KEYMGMT_SELECT_ALL                \
-    ( OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS )
+#define OSSL_KEYMGMT_SELECT_ALL_PARAMETERS \
+    (OSSL_KEYMGMT_SELECT_DOMAIN_PARAMETERS \
+        | OSSL_KEYMGMT_SELECT_OTHER_PARAMETERS)
+#define OSSL_KEYMGMT_SELECT_KEYPAIR \
+    (OSSL_KEYMGMT_SELECT_PRIVATE_KEY | OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
+#define OSSL_KEYMGMT_SELECT_ALL \
+    (OSSL_KEYMGMT_SELECT_KEYPAIR | OSSL_KEYMGMT_SELECT_ALL_PARAMETERS)
 
-# define OSSL_KEYMGMT_VALIDATE_FULL_CHECK              0
-# define OSSL_KEYMGMT_VALIDATE_QUICK_CHECK             1
+#define OSSL_KEYMGMT_VALIDATE_FULL_CHECK 0
+#define OSSL_KEYMGMT_VALIDATE_QUICK_CHECK 1
 
 /* Basic key object creation */
-# define OSSL_FUNC_KEYMGMT_NEW                         1
+#define OSSL_FUNC_KEYMGMT_NEW 1
 OSSL_CORE_MAKE_FUNC(void *, keymgmt_new, (void *provctx))
 
 /* Generation, a more complex constructor */
-# define OSSL_FUNC_KEYMGMT_GEN_INIT                    2
-# define OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE            3
-# define OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS              4
-# define OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS         5
-# define OSSL_FUNC_KEYMGMT_GEN                         6
-# define OSSL_FUNC_KEYMGMT_GEN_CLEANUP                 7
-# define OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS              15
-# define OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS         16
+#define OSSL_FUNC_KEYMGMT_GEN_INIT 2
+#define OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE 3
+#define OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS 4
+#define OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS 5
+#define OSSL_FUNC_KEYMGMT_GEN 6
+#define OSSL_FUNC_KEYMGMT_GEN_CLEANUP 7
+#define OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS 15
+#define OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS 16
 
 OSSL_CORE_MAKE_FUNC(void *, keymgmt_gen_init,
-                    (void *provctx, int selection, const OSSL_PARAM params[]))
+    (void *provctx, int selection, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, keymgmt_gen_set_template,
-                    (void *genctx, void *templ))
+    (void *genctx, void *templ))
 OSSL_CORE_MAKE_FUNC(int, keymgmt_gen_set_params,
-                    (void *genctx, const OSSL_PARAM params[]))
+    (void *genctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,
-                    keymgmt_gen_settable_params,
-                    (void *genctx, void *provctx))
+    keymgmt_gen_settable_params,
+    (void *genctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, keymgmt_gen_get_params,
-                    (void *genctx, OSSL_PARAM params[]))
+    (void *genctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_gen_gettable_params,
-                    (void *genctx, void *provctx))
+    (void *genctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(void *, keymgmt_gen,
-                    (void *genctx, OSSL_CALLBACK *cb, void *cbarg))
+    (void *genctx, OSSL_CALLBACK *cb, void *cbarg))
 OSSL_CORE_MAKE_FUNC(void, keymgmt_gen_cleanup, (void *genctx))
 
 /* Key loading by object reference */
-# define OSSL_FUNC_KEYMGMT_LOAD                        8
+#define OSSL_FUNC_KEYMGMT_LOAD 8
 OSSL_CORE_MAKE_FUNC(void *, keymgmt_load,
-                    (const void *reference, size_t reference_sz))
+    (const void *reference, size_t reference_sz))
 
 /* Basic key object destruction */
-# define OSSL_FUNC_KEYMGMT_FREE                       10
+#define OSSL_FUNC_KEYMGMT_FREE 10
 OSSL_CORE_MAKE_FUNC(void, keymgmt_free, (void *keydata))
 
 /* Key object information, with discovery */
-#define OSSL_FUNC_KEYMGMT_GET_PARAMS                  11
-#define OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS             12
+#define OSSL_FUNC_KEYMGMT_GET_PARAMS 11
+#define OSSL_FUNC_KEYMGMT_GETTABLE_PARAMS 12
 OSSL_CORE_MAKE_FUNC(int, keymgmt_get_params,
-                    (void *keydata, OSSL_PARAM params[]))
+    (void *keydata, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_gettable_params,
-                    (void *provctx))
+    (void *provctx))
 
-#define OSSL_FUNC_KEYMGMT_SET_PARAMS                  13
-#define OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS             14
+#define OSSL_FUNC_KEYMGMT_SET_PARAMS 13
+#define OSSL_FUNC_KEYMGMT_SETTABLE_PARAMS 14
 OSSL_CORE_MAKE_FUNC(int, keymgmt_set_params,
-                    (void *keydata, const OSSL_PARAM params[]))
+    (void *keydata, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_settable_params,
-                    (void *provctx))
+    (void *provctx))
 
 /* Key checks - discovery of supported operations */
-# define OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME       20
+#define OSSL_FUNC_KEYMGMT_QUERY_OPERATION_NAME 20
 OSSL_CORE_MAKE_FUNC(const char *, keymgmt_query_operation_name,
-                    (int operation_id))
+    (int operation_id))
 
 /* Key checks - key data content checks */
-# define OSSL_FUNC_KEYMGMT_HAS                        21
+#define OSSL_FUNC_KEYMGMT_HAS 21
 OSSL_CORE_MAKE_FUNC(int, keymgmt_has, (const void *keydata, int selection))
 
 /* Key checks - validation */
-# define OSSL_FUNC_KEYMGMT_VALIDATE                   22
-OSSL_CORE_MAKE_FUNC(int, keymgmt_validate, (const void *keydata, int selection,
-                                            int checktype))
+#define OSSL_FUNC_KEYMGMT_VALIDATE 22
+OSSL_CORE_MAKE_FUNC(int, keymgmt_validate, (const void *keydata, int selection, int checktype))
 
 /* Key checks - matching */
-# define OSSL_FUNC_KEYMGMT_MATCH                      23
+#define OSSL_FUNC_KEYMGMT_MATCH 23
 OSSL_CORE_MAKE_FUNC(int, keymgmt_match,
-                    (const void *keydata1, const void *keydata2,
-                     int selection))
+    (const void *keydata1, const void *keydata2,
+        int selection))
 
 /* Import and export functions, with discovery */
-# define OSSL_FUNC_KEYMGMT_IMPORT                     40
-# define OSSL_FUNC_KEYMGMT_IMPORT_TYPES               41
-# define OSSL_FUNC_KEYMGMT_EXPORT                     42
-# define OSSL_FUNC_KEYMGMT_EXPORT_TYPES               43
+#define OSSL_FUNC_KEYMGMT_IMPORT 40
+#define OSSL_FUNC_KEYMGMT_IMPORT_TYPES 41
+#define OSSL_FUNC_KEYMGMT_EXPORT 42
+#define OSSL_FUNC_KEYMGMT_EXPORT_TYPES 43
 OSSL_CORE_MAKE_FUNC(int, keymgmt_import,
-                    (void *keydata, int selection, const OSSL_PARAM params[]))
+    (void *keydata, int selection, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_import_types,
-                    (int selection))
+    (int selection))
 OSSL_CORE_MAKE_FUNC(int, keymgmt_export,
-                    (void *keydata, int selection,
-                     OSSL_CALLBACK *param_cb, void *cbarg))
+    (void *keydata, int selection,
+        OSSL_CALLBACK *param_cb, void *cbarg))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_export_types,
-                    (int selection))
+    (int selection))
 
 /* Dup function, constructor */
-# define OSSL_FUNC_KEYMGMT_DUP                        44
+#define OSSL_FUNC_KEYMGMT_DUP 44
 OSSL_CORE_MAKE_FUNC(void *, keymgmt_dup,
-                    (const void *keydata_from, int selection))
+    (const void *keydata_from, int selection))
 
 /* Extended import and export functions */
-# define OSSL_FUNC_KEYMGMT_IMPORT_TYPES_EX            45
-# define OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX            46
+#define OSSL_FUNC_KEYMGMT_IMPORT_TYPES_EX 45
+#define OSSL_FUNC_KEYMGMT_EXPORT_TYPES_EX 46
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_import_types_ex,
-                    (void *provctx, int selection))
+    (void *provctx, int selection))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keymgmt_export_types_ex,
-                    (void *provctx, int selection))
+    (void *provctx, int selection))
 
 /* Key Exchange */
 
-# define OSSL_FUNC_KEYEXCH_NEWCTX                      1
-# define OSSL_FUNC_KEYEXCH_INIT                        2
-# define OSSL_FUNC_KEYEXCH_DERIVE                      3
-# define OSSL_FUNC_KEYEXCH_SET_PEER                    4
-# define OSSL_FUNC_KEYEXCH_FREECTX                     5
-# define OSSL_FUNC_KEYEXCH_DUPCTX                      6
-# define OSSL_FUNC_KEYEXCH_SET_CTX_PARAMS              7
-# define OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS         8
-# define OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS              9
-# define OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS        10
+#define OSSL_FUNC_KEYEXCH_NEWCTX 1
+#define OSSL_FUNC_KEYEXCH_INIT 2
+#define OSSL_FUNC_KEYEXCH_DERIVE 3
+#define OSSL_FUNC_KEYEXCH_SET_PEER 4
+#define OSSL_FUNC_KEYEXCH_FREECTX 5
+#define OSSL_FUNC_KEYEXCH_DUPCTX 6
+#define OSSL_FUNC_KEYEXCH_SET_CTX_PARAMS 7
+#define OSSL_FUNC_KEYEXCH_SETTABLE_CTX_PARAMS 8
+#define OSSL_FUNC_KEYEXCH_GET_CTX_PARAMS 9
+#define OSSL_FUNC_KEYEXCH_GETTABLE_CTX_PARAMS 10
 
 OSSL_CORE_MAKE_FUNC(void *, keyexch_newctx, (void *provctx))
-OSSL_CORE_MAKE_FUNC(int, keyexch_init, (void *ctx, void *provkey,
-                                        const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, keyexch_derive, (void *ctx,  unsigned char *secret,
-                                             size_t *secretlen, size_t outlen))
+OSSL_CORE_MAKE_FUNC(int, keyexch_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, keyexch_derive, (void *ctx, unsigned char *secret, size_t *secretlen, size_t outlen))
 OSSL_CORE_MAKE_FUNC(int, keyexch_set_peer, (void *ctx, void *provkey))
 OSSL_CORE_MAKE_FUNC(void, keyexch_freectx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(void *, keyexch_dupctx, (void *ctx))
-OSSL_CORE_MAKE_FUNC(int, keyexch_set_ctx_params, (void *ctx,
-                                                     const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, keyexch_set_ctx_params, (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keyexch_settable_ctx_params,
-                    (void *ctx, void *provctx))
-OSSL_CORE_MAKE_FUNC(int, keyexch_get_ctx_params, (void *ctx,
-                                                     OSSL_PARAM params[]))
+    (void *ctx, void *provctx))
+OSSL_CORE_MAKE_FUNC(int, keyexch_get_ctx_params, (void *ctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, keyexch_gettable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 
 /* Signature */
 
-# define OSSL_FUNC_SIGNATURE_NEWCTX                  1
-# define OSSL_FUNC_SIGNATURE_SIGN_INIT               2
-# define OSSL_FUNC_SIGNATURE_SIGN                    3
-# define OSSL_FUNC_SIGNATURE_VERIFY_INIT             4
-# define OSSL_FUNC_SIGNATURE_VERIFY                  5
-# define OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT     6
-# define OSSL_FUNC_SIGNATURE_VERIFY_RECOVER          7
-# define OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT        8
-# define OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE      9
-# define OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL      10
-# define OSSL_FUNC_SIGNATURE_DIGEST_SIGN            11
-# define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT     12
-# define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE   13
-# define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL    14
-# define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY          15
-# define OSSL_FUNC_SIGNATURE_FREECTX                16
-# define OSSL_FUNC_SIGNATURE_DUPCTX                 17
-# define OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS         18
-# define OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS    19
-# define OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS         20
-# define OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS    21
-# define OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS      22
-# define OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS 23
-# define OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS      24
-# define OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS 25
-# define OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES        26
-# define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT      27
-# define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE    28
-# define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL     29
-# define OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT    30
-# define OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE  31
-# define OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL   32
+#define OSSL_FUNC_SIGNATURE_NEWCTX 1
+#define OSSL_FUNC_SIGNATURE_SIGN_INIT 2
+#define OSSL_FUNC_SIGNATURE_SIGN 3
+#define OSSL_FUNC_SIGNATURE_VERIFY_INIT 4
+#define OSSL_FUNC_SIGNATURE_VERIFY 5
+#define OSSL_FUNC_SIGNATURE_VERIFY_RECOVER_INIT 6
+#define OSSL_FUNC_SIGNATURE_VERIFY_RECOVER 7
+#define OSSL_FUNC_SIGNATURE_DIGEST_SIGN_INIT 8
+#define OSSL_FUNC_SIGNATURE_DIGEST_SIGN_UPDATE 9
+#define OSSL_FUNC_SIGNATURE_DIGEST_SIGN_FINAL 10
+#define OSSL_FUNC_SIGNATURE_DIGEST_SIGN 11
+#define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_INIT 12
+#define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_UPDATE 13
+#define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY_FINAL 14
+#define OSSL_FUNC_SIGNATURE_DIGEST_VERIFY 15
+#define OSSL_FUNC_SIGNATURE_FREECTX 16
+#define OSSL_FUNC_SIGNATURE_DUPCTX 17
+#define OSSL_FUNC_SIGNATURE_GET_CTX_PARAMS 18
+#define OSSL_FUNC_SIGNATURE_GETTABLE_CTX_PARAMS 19
+#define OSSL_FUNC_SIGNATURE_SET_CTX_PARAMS 20
+#define OSSL_FUNC_SIGNATURE_SETTABLE_CTX_PARAMS 21
+#define OSSL_FUNC_SIGNATURE_GET_CTX_MD_PARAMS 22
+#define OSSL_FUNC_SIGNATURE_GETTABLE_CTX_MD_PARAMS 23
+#define OSSL_FUNC_SIGNATURE_SET_CTX_MD_PARAMS 24
+#define OSSL_FUNC_SIGNATURE_SETTABLE_CTX_MD_PARAMS 25
+#define OSSL_FUNC_SIGNATURE_QUERY_KEY_TYPES 26
+#define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_INIT 27
+#define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_UPDATE 28
+#define OSSL_FUNC_SIGNATURE_SIGN_MESSAGE_FINAL 29
+#define OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_INIT 30
+#define OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_UPDATE 31
+#define OSSL_FUNC_SIGNATURE_VERIFY_MESSAGE_FINAL 32
 
-OSSL_CORE_MAKE_FUNC(void *, signature_newctx, (void *provctx,
-                                               const char *propq))
-OSSL_CORE_MAKE_FUNC(int, signature_sign_init, (void *ctx, void *provkey,
-                                               const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, signature_sign, (void *ctx,  unsigned char *sig,
-                                          size_t *siglen, size_t sigsize,
-                                          const unsigned char *tbs,
-                                          size_t tbslen))
+OSSL_CORE_MAKE_FUNC(void *, signature_newctx, (void *provctx, const char *propq))
+OSSL_CORE_MAKE_FUNC(int, signature_sign_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, signature_sign, (void *ctx, unsigned char *sig, size_t *siglen, size_t sigsize, const unsigned char *tbs, size_t tbslen))
 OSSL_CORE_MAKE_FUNC(int, signature_sign_message_init,
-                    (void *ctx, void *provkey, const OSSL_PARAM params[]))
+    (void *ctx, void *provkey, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, signature_sign_message_update,
-                    (void *ctx, const unsigned char *in, size_t inlen))
+    (void *ctx, const unsigned char *in, size_t inlen))
 OSSL_CORE_MAKE_FUNC(int, signature_sign_message_final,
-                    (void *ctx, unsigned char *sig,
-                     size_t *siglen, size_t sigsize))
-OSSL_CORE_MAKE_FUNC(int, signature_verify_init, (void *ctx, void *provkey,
-                                                 const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, signature_verify, (void *ctx,
-                                            const unsigned char *sig,
-                                            size_t siglen,
-                                            const unsigned char *tbs,
-                                            size_t tbslen))
+    (void *ctx, unsigned char *sig,
+        size_t *siglen, size_t sigsize))
+OSSL_CORE_MAKE_FUNC(int, signature_verify_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, signature_verify, (void *ctx, const unsigned char *sig, size_t siglen, const unsigned char *tbs, size_t tbslen))
 OSSL_CORE_MAKE_FUNC(int, signature_verify_message_init,
-                    (void *ctx, void *provkey, const OSSL_PARAM params[]))
+    (void *ctx, void *provkey, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, signature_verify_message_update,
-                    (void *ctx, const unsigned char *in, size_t inlen))
+    (void *ctx, const unsigned char *in, size_t inlen))
 /*
  * signature_verify_final requires that the signature to be verified against
  * is specified via an OSSL_PARAM.
  */
 OSSL_CORE_MAKE_FUNC(int, signature_verify_message_final, (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, signature_verify_recover_init,
-                    (void *ctx, void *provkey, const OSSL_PARAM params[]))
+    (void *ctx, void *provkey, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, signature_verify_recover,
-                    (void *ctx, unsigned char *rout, size_t *routlen,
-                     size_t routsize, const unsigned char *sig, size_t siglen))
+    (void *ctx, unsigned char *rout, size_t *routlen,
+        size_t routsize, const unsigned char *sig, size_t siglen))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_sign_init,
-                    (void *ctx, const char *mdname, void *provkey,
-                     const OSSL_PARAM params[]))
+    (void *ctx, const char *mdname, void *provkey,
+        const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_sign_update,
-                    (void *ctx, const unsigned char *data, size_t datalen))
+    (void *ctx, const unsigned char *data, size_t datalen))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_sign_final,
-                    (void *ctx, unsigned char *sig, size_t *siglen,
-                     size_t sigsize))
+    (void *ctx, unsigned char *sig, size_t *siglen,
+        size_t sigsize))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_sign,
-                    (void *ctx, unsigned char *sigret, size_t *siglen,
-                     size_t sigsize, const unsigned char *tbs, size_t tbslen))
+    (void *ctx, unsigned char *sigret, size_t *siglen,
+        size_t sigsize, const unsigned char *tbs, size_t tbslen))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_verify_init,
-                    (void *ctx, const char *mdname, void *provkey,
-                     const OSSL_PARAM params[]))
+    (void *ctx, const char *mdname, void *provkey,
+        const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_verify_update,
-                    (void *ctx, const unsigned char *data, size_t datalen))
+    (void *ctx, const unsigned char *data, size_t datalen))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_verify_final,
-                    (void *ctx, const unsigned char *sig, size_t siglen))
+    (void *ctx, const unsigned char *sig, size_t siglen))
 OSSL_CORE_MAKE_FUNC(int, signature_digest_verify,
-                    (void *ctx, const unsigned char *sig, size_t siglen,
-                     const unsigned char *tbs, size_t tbslen))
+    (void *ctx, const unsigned char *sig, size_t siglen,
+        const unsigned char *tbs, size_t tbslen))
 OSSL_CORE_MAKE_FUNC(void, signature_freectx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(void *, signature_dupctx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, signature_get_ctx_params,
-                    (void *ctx, OSSL_PARAM params[]))
+    (void *ctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, signature_gettable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, signature_set_ctx_params,
-                    (void *ctx, const OSSL_PARAM params[]))
+    (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, signature_settable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, signature_get_ctx_md_params,
-                    (void *ctx, OSSL_PARAM params[]))
+    (void *ctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, signature_gettable_ctx_md_params,
-                    (void *ctx))
+    (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, signature_set_ctx_md_params,
-                    (void *ctx, const OSSL_PARAM params[]))
+    (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, signature_settable_ctx_md_params,
-                    (void *ctx))
+    (void *ctx))
 OSSL_CORE_MAKE_FUNC(const char **, signature_query_key_types, (void))
 
 /*-
@@ -920,179 +852,156 @@ OSSL_CORE_MAKE_FUNC(const char **, signature_query_key_types, (void))
  */
 
 /* Key data subset selection - individual bits */
-# define OSSL_SKEYMGMT_SELECT_PARAMETERS      0x01
-# define OSSL_SKEYMGMT_SELECT_SECRET_KEY      0x02
+#define OSSL_SKEYMGMT_SELECT_PARAMETERS 0x01
+#define OSSL_SKEYMGMT_SELECT_SECRET_KEY 0x02
 
 /* Key data subset selection - combinations */
-# define OSSL_SKEYMGMT_SELECT_ALL                \
+#define OSSL_SKEYMGMT_SELECT_ALL \
     (OSSL_SKEYMGMT_SELECT_PARAMETERS | OSSL_SKEYMGMT_SELECT_SECRET_KEY)
 
-# define OSSL_FUNC_SKEYMGMT_FREE                1
-# define OSSL_FUNC_SKEYMGMT_IMPORT              2
-# define OSSL_FUNC_SKEYMGMT_EXPORT              3
-# define OSSL_FUNC_SKEYMGMT_GENERATE            4
-# define OSSL_FUNC_SKEYMGMT_GET_KEY_ID          5
-# define OSSL_FUNC_SKEYMGMT_IMP_SETTABLE_PARAMS 6
-# define OSSL_FUNC_SKEYMGMT_GEN_SETTABLE_PARAMS 7
+#define OSSL_FUNC_SKEYMGMT_FREE 1
+#define OSSL_FUNC_SKEYMGMT_IMPORT 2
+#define OSSL_FUNC_SKEYMGMT_EXPORT 3
+#define OSSL_FUNC_SKEYMGMT_GENERATE 4
+#define OSSL_FUNC_SKEYMGMT_GET_KEY_ID 5
+#define OSSL_FUNC_SKEYMGMT_IMP_SETTABLE_PARAMS 6
+#define OSSL_FUNC_SKEYMGMT_GEN_SETTABLE_PARAMS 7
 
 OSSL_CORE_MAKE_FUNC(void, skeymgmt_free, (void *keydata))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,
-                    skeymgmt_imp_settable_params, (void *provctx))
-OSSL_CORE_MAKE_FUNC(void *, skeymgmt_import, (void *provctx, int selection,
-                                              const OSSL_PARAM params[]))
+    skeymgmt_imp_settable_params, (void *provctx))
+OSSL_CORE_MAKE_FUNC(void *, skeymgmt_import, (void *provctx, int selection, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, skeymgmt_export,
-                    (void *keydata, int selection,
-                     OSSL_CALLBACK *param_cb, void *cbarg))
+    (void *keydata, int selection,
+        OSSL_CALLBACK *param_cb, void *cbarg))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *,
-                    skeymgmt_gen_settable_params, (void *provctx))
-OSSL_CORE_MAKE_FUNC(void *, skeymgmt_generate, (void *provctx,
-                                                const OSSL_PARAM params[]))
+    skeymgmt_gen_settable_params, (void *provctx))
+OSSL_CORE_MAKE_FUNC(void *, skeymgmt_generate, (void *provctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const char *, skeymgmt_get_key_id, (void *keydata))
 
 /* Asymmetric Ciphers */
 
-# define OSSL_FUNC_ASYM_CIPHER_NEWCTX                  1
-# define OSSL_FUNC_ASYM_CIPHER_ENCRYPT_INIT            2
-# define OSSL_FUNC_ASYM_CIPHER_ENCRYPT                 3
-# define OSSL_FUNC_ASYM_CIPHER_DECRYPT_INIT            4
-# define OSSL_FUNC_ASYM_CIPHER_DECRYPT                 5
-# define OSSL_FUNC_ASYM_CIPHER_FREECTX                 6
-# define OSSL_FUNC_ASYM_CIPHER_DUPCTX                  7
-# define OSSL_FUNC_ASYM_CIPHER_GET_CTX_PARAMS          8
-# define OSSL_FUNC_ASYM_CIPHER_GETTABLE_CTX_PARAMS     9
-# define OSSL_FUNC_ASYM_CIPHER_SET_CTX_PARAMS         10
-# define OSSL_FUNC_ASYM_CIPHER_SETTABLE_CTX_PARAMS    11
+#define OSSL_FUNC_ASYM_CIPHER_NEWCTX 1
+#define OSSL_FUNC_ASYM_CIPHER_ENCRYPT_INIT 2
+#define OSSL_FUNC_ASYM_CIPHER_ENCRYPT 3
+#define OSSL_FUNC_ASYM_CIPHER_DECRYPT_INIT 4
+#define OSSL_FUNC_ASYM_CIPHER_DECRYPT 5
+#define OSSL_FUNC_ASYM_CIPHER_FREECTX 6
+#define OSSL_FUNC_ASYM_CIPHER_DUPCTX 7
+#define OSSL_FUNC_ASYM_CIPHER_GET_CTX_PARAMS 8
+#define OSSL_FUNC_ASYM_CIPHER_GETTABLE_CTX_PARAMS 9
+#define OSSL_FUNC_ASYM_CIPHER_SET_CTX_PARAMS 10
+#define OSSL_FUNC_ASYM_CIPHER_SETTABLE_CTX_PARAMS 11
 
 OSSL_CORE_MAKE_FUNC(void *, asym_cipher_newctx, (void *provctx))
-OSSL_CORE_MAKE_FUNC(int, asym_cipher_encrypt_init, (void *ctx, void *provkey,
-                                                    const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, asym_cipher_encrypt, (void *ctx, unsigned char *out,
-                                                  size_t *outlen,
-                                                  size_t outsize,
-                                                  const unsigned char *in,
-                                                  size_t inlen))
-OSSL_CORE_MAKE_FUNC(int, asym_cipher_decrypt_init, (void *ctx, void *provkey,
-                                                    const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, asym_cipher_decrypt, (void *ctx, unsigned char *out,
-                                                  size_t *outlen,
-                                                  size_t outsize,
-                                                  const unsigned char *in,
-                                                  size_t inlen))
+OSSL_CORE_MAKE_FUNC(int, asym_cipher_encrypt_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, asym_cipher_encrypt, (void *ctx, unsigned char *out, size_t *outlen, size_t outsize, const unsigned char *in, size_t inlen))
+OSSL_CORE_MAKE_FUNC(int, asym_cipher_decrypt_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, asym_cipher_decrypt, (void *ctx, unsigned char *out, size_t *outlen, size_t outsize, const unsigned char *in, size_t inlen))
 OSSL_CORE_MAKE_FUNC(void, asym_cipher_freectx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(void *, asym_cipher_dupctx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, asym_cipher_get_ctx_params,
-                    (void *ctx, OSSL_PARAM params[]))
+    (void *ctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, asym_cipher_gettable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, asym_cipher_set_ctx_params,
-                    (void *ctx, const OSSL_PARAM params[]))
+    (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, asym_cipher_settable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 
 /* Asymmetric Key encapsulation */
-# define OSSL_FUNC_KEM_NEWCTX                  1
-# define OSSL_FUNC_KEM_ENCAPSULATE_INIT        2
-# define OSSL_FUNC_KEM_ENCAPSULATE             3
-# define OSSL_FUNC_KEM_DECAPSULATE_INIT        4
-# define OSSL_FUNC_KEM_DECAPSULATE             5
-# define OSSL_FUNC_KEM_FREECTX                 6
-# define OSSL_FUNC_KEM_DUPCTX                  7
-# define OSSL_FUNC_KEM_GET_CTX_PARAMS          8
-# define OSSL_FUNC_KEM_GETTABLE_CTX_PARAMS     9
-# define OSSL_FUNC_KEM_SET_CTX_PARAMS         10
-# define OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS    11
-# define OSSL_FUNC_KEM_AUTH_ENCAPSULATE_INIT  12
-# define OSSL_FUNC_KEM_AUTH_DECAPSULATE_INIT  13
+#define OSSL_FUNC_KEM_NEWCTX 1
+#define OSSL_FUNC_KEM_ENCAPSULATE_INIT 2
+#define OSSL_FUNC_KEM_ENCAPSULATE 3
+#define OSSL_FUNC_KEM_DECAPSULATE_INIT 4
+#define OSSL_FUNC_KEM_DECAPSULATE 5
+#define OSSL_FUNC_KEM_FREECTX 6
+#define OSSL_FUNC_KEM_DUPCTX 7
+#define OSSL_FUNC_KEM_GET_CTX_PARAMS 8
+#define OSSL_FUNC_KEM_GETTABLE_CTX_PARAMS 9
+#define OSSL_FUNC_KEM_SET_CTX_PARAMS 10
+#define OSSL_FUNC_KEM_SETTABLE_CTX_PARAMS 11
+#define OSSL_FUNC_KEM_AUTH_ENCAPSULATE_INIT 12
+#define OSSL_FUNC_KEM_AUTH_DECAPSULATE_INIT 13
 
 OSSL_CORE_MAKE_FUNC(void *, kem_newctx, (void *provctx))
-OSSL_CORE_MAKE_FUNC(int, kem_encapsulate_init, (void *ctx, void *provkey,
-                                                const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, kem_auth_encapsulate_init, (void *ctx, void *provkey,
-                                                     void *authprivkey,
-                                                     const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, kem_encapsulate, (void *ctx,
-                                           unsigned char *out, size_t *outlen,
-                                           unsigned char *secret,
-                                           size_t *secretlen))
-OSSL_CORE_MAKE_FUNC(int, kem_decapsulate_init, (void *ctx, void *provkey,
-                                                const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, kem_auth_decapsulate_init, (void *ctx, void *provkey,
-                                                     void *authpubkey,
-                                                     const OSSL_PARAM params[]))
-OSSL_CORE_MAKE_FUNC(int, kem_decapsulate, (void *ctx,
-                                           unsigned char *out, size_t *outlen,
-                                           const unsigned char *in, size_t inlen))
+OSSL_CORE_MAKE_FUNC(int, kem_encapsulate_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, kem_auth_encapsulate_init, (void *ctx, void *provkey, void *authprivkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, kem_encapsulate, (void *ctx, unsigned char *out, size_t *outlen, unsigned char *secret, size_t *secretlen))
+OSSL_CORE_MAKE_FUNC(int, kem_decapsulate_init, (void *ctx, void *provkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, kem_auth_decapsulate_init, (void *ctx, void *provkey, void *authpubkey, const OSSL_PARAM params[]))
+OSSL_CORE_MAKE_FUNC(int, kem_decapsulate, (void *ctx, unsigned char *out, size_t *outlen, const unsigned char *in, size_t inlen))
 OSSL_CORE_MAKE_FUNC(void, kem_freectx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(void *, kem_dupctx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, kem_get_ctx_params, (void *ctx, OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kem_gettable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, kem_set_ctx_params,
-                    (void *ctx, const OSSL_PARAM params[]))
+    (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kem_settable_ctx_params,
-                    (void *ctx, void *provctx))
+    (void *ctx, void *provctx))
 
 /* Encoders and decoders */
-# define OSSL_FUNC_ENCODER_NEWCTX                      1
-# define OSSL_FUNC_ENCODER_FREECTX                     2
-# define OSSL_FUNC_ENCODER_GET_PARAMS                  3
-# define OSSL_FUNC_ENCODER_GETTABLE_PARAMS             4
-# define OSSL_FUNC_ENCODER_SET_CTX_PARAMS              5
-# define OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS         6
-# define OSSL_FUNC_ENCODER_DOES_SELECTION             10
-# define OSSL_FUNC_ENCODER_ENCODE                     11
-# define OSSL_FUNC_ENCODER_IMPORT_OBJECT              20
-# define OSSL_FUNC_ENCODER_FREE_OBJECT                21
+#define OSSL_FUNC_ENCODER_NEWCTX 1
+#define OSSL_FUNC_ENCODER_FREECTX 2
+#define OSSL_FUNC_ENCODER_GET_PARAMS 3
+#define OSSL_FUNC_ENCODER_GETTABLE_PARAMS 4
+#define OSSL_FUNC_ENCODER_SET_CTX_PARAMS 5
+#define OSSL_FUNC_ENCODER_SETTABLE_CTX_PARAMS 6
+#define OSSL_FUNC_ENCODER_DOES_SELECTION 10
+#define OSSL_FUNC_ENCODER_ENCODE 11
+#define OSSL_FUNC_ENCODER_IMPORT_OBJECT 20
+#define OSSL_FUNC_ENCODER_FREE_OBJECT 21
 OSSL_CORE_MAKE_FUNC(void *, encoder_newctx, (void *provctx))
 OSSL_CORE_MAKE_FUNC(void, encoder_freectx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, encoder_get_params, (OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, encoder_gettable_params,
-                    (void *provctx))
+    (void *provctx))
 OSSL_CORE_MAKE_FUNC(int, encoder_set_ctx_params,
-                    (void *ctx, const OSSL_PARAM params[]))
+    (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, encoder_settable_ctx_params,
-                    (void *provctx))
+    (void *provctx))
 
 OSSL_CORE_MAKE_FUNC(int, encoder_does_selection,
-                    (void *provctx, int selection))
+    (void *provctx, int selection))
 OSSL_CORE_MAKE_FUNC(int, encoder_encode,
-                    (void *ctx, OSSL_CORE_BIO *out,
-                     const void *obj_raw, const OSSL_PARAM obj_abstract[],
-                     int selection,
-                     OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg))
+    (void *ctx, OSSL_CORE_BIO *out,
+        const void *obj_raw, const OSSL_PARAM obj_abstract[],
+        int selection,
+        OSSL_PASSPHRASE_CALLBACK *cb, void *cbarg))
 
 OSSL_CORE_MAKE_FUNC(void *, encoder_import_object,
-                    (void *ctx, int selection, const OSSL_PARAM params[]))
+    (void *ctx, int selection, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(void, encoder_free_object, (void *obj))
 
-# define OSSL_FUNC_DECODER_NEWCTX                      1
-# define OSSL_FUNC_DECODER_FREECTX                     2
-# define OSSL_FUNC_DECODER_GET_PARAMS                  3
-# define OSSL_FUNC_DECODER_GETTABLE_PARAMS             4
-# define OSSL_FUNC_DECODER_SET_CTX_PARAMS              5
-# define OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS         6
-# define OSSL_FUNC_DECODER_DOES_SELECTION             10
-# define OSSL_FUNC_DECODER_DECODE                     11
-# define OSSL_FUNC_DECODER_EXPORT_OBJECT              20
+#define OSSL_FUNC_DECODER_NEWCTX 1
+#define OSSL_FUNC_DECODER_FREECTX 2
+#define OSSL_FUNC_DECODER_GET_PARAMS 3
+#define OSSL_FUNC_DECODER_GETTABLE_PARAMS 4
+#define OSSL_FUNC_DECODER_SET_CTX_PARAMS 5
+#define OSSL_FUNC_DECODER_SETTABLE_CTX_PARAMS 6
+#define OSSL_FUNC_DECODER_DOES_SELECTION 10
+#define OSSL_FUNC_DECODER_DECODE 11
+#define OSSL_FUNC_DECODER_EXPORT_OBJECT 20
 OSSL_CORE_MAKE_FUNC(void *, decoder_newctx, (void *provctx))
 OSSL_CORE_MAKE_FUNC(void, decoder_freectx, (void *ctx))
 OSSL_CORE_MAKE_FUNC(int, decoder_get_params, (OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, decoder_gettable_params,
-                    (void *provctx))
+    (void *provctx))
 OSSL_CORE_MAKE_FUNC(int, decoder_set_ctx_params,
-                    (void *ctx, const OSSL_PARAM params[]))
+    (void *ctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, decoder_settable_ctx_params,
-                    (void *provctx))
+    (void *provctx))
 
 OSSL_CORE_MAKE_FUNC(int, decoder_does_selection,
-                    (void *provctx, int selection))
+    (void *provctx, int selection))
 OSSL_CORE_MAKE_FUNC(int, decoder_decode,
-                    (void *ctx, OSSL_CORE_BIO *in, int selection,
-                     OSSL_CALLBACK *data_cb, void *data_cbarg,
-                     OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
+    (void *ctx, OSSL_CORE_BIO *in, int selection,
+        OSSL_CALLBACK *data_cb, void *data_cbarg,
+        OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
 OSSL_CORE_MAKE_FUNC(int, decoder_export_object,
-                    (void *ctx, const void *objref, size_t objref_sz,
-                     OSSL_CALLBACK *export_cb, void *export_cbarg))
+    (void *ctx, const void *objref, size_t objref_sz,
+        OSSL_CALLBACK *export_cb, void *export_cbarg))
 
 /*-
  * Store
@@ -1106,40 +1015,40 @@ OSSL_CORE_MAKE_FUNC(int, decoder_export_object,
  * deal with.
  */
 
-#define OSSL_FUNC_STORE_OPEN                        1
-#define OSSL_FUNC_STORE_ATTACH                      2
-#define OSSL_FUNC_STORE_SETTABLE_CTX_PARAMS         3
-#define OSSL_FUNC_STORE_SET_CTX_PARAMS              4
-#define OSSL_FUNC_STORE_LOAD                        5
-#define OSSL_FUNC_STORE_EOF                         6
-#define OSSL_FUNC_STORE_CLOSE                       7
-#define OSSL_FUNC_STORE_EXPORT_OBJECT               8
-#define OSSL_FUNC_STORE_DELETE                      9
-#define OSSL_FUNC_STORE_OPEN_EX                     10
+#define OSSL_FUNC_STORE_OPEN 1
+#define OSSL_FUNC_STORE_ATTACH 2
+#define OSSL_FUNC_STORE_SETTABLE_CTX_PARAMS 3
+#define OSSL_FUNC_STORE_SET_CTX_PARAMS 4
+#define OSSL_FUNC_STORE_LOAD 5
+#define OSSL_FUNC_STORE_EOF 6
+#define OSSL_FUNC_STORE_CLOSE 7
+#define OSSL_FUNC_STORE_EXPORT_OBJECT 8
+#define OSSL_FUNC_STORE_DELETE 9
+#define OSSL_FUNC_STORE_OPEN_EX 10
 OSSL_CORE_MAKE_FUNC(void *, store_open, (void *provctx, const char *uri))
 OSSL_CORE_MAKE_FUNC(void *, store_attach, (void *provctx, OSSL_CORE_BIO *in))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, store_settable_ctx_params,
-                    (void *provctx))
+    (void *provctx))
 OSSL_CORE_MAKE_FUNC(int, store_set_ctx_params,
-                    (void *loaderctx, const OSSL_PARAM params[]))
+    (void *loaderctx, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, store_load,
-                    (void *loaderctx,
-                     OSSL_CALLBACK *object_cb, void *object_cbarg,
-                     OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
+    (void *loaderctx,
+        OSSL_CALLBACK *object_cb, void *object_cbarg,
+        OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
 OSSL_CORE_MAKE_FUNC(int, store_eof, (void *loaderctx))
 OSSL_CORE_MAKE_FUNC(int, store_close, (void *loaderctx))
 OSSL_CORE_MAKE_FUNC(int, store_export_object,
-                    (void *loaderctx, const void *objref, size_t objref_sz,
-                     OSSL_CALLBACK *export_cb, void *export_cbarg))
+    (void *loaderctx, const void *objref, size_t objref_sz,
+        OSSL_CALLBACK *export_cb, void *export_cbarg))
 OSSL_CORE_MAKE_FUNC(int, store_delete,
-                    (void *provctx, const char *uri, const OSSL_PARAM params[],
-                     OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
+    (void *provctx, const char *uri, const OSSL_PARAM params[],
+        OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
 OSSL_CORE_MAKE_FUNC(void *, store_open_ex,
-                    (void *provctx, const char *uri, const OSSL_PARAM params[],
-                     OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
+    (void *provctx, const char *uri, const OSSL_PARAM params[],
+        OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg))
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/core_names.h.in b/include/openssl/core_names.h.in
index d53cac43327c..897a7a94cc5b 100644
--- a/include/openssl/core_names.h.in
+++ b/include/openssl/core_names.h.in
@@ -8,119 +8,123 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+/* clang-format off */
 {-
 use OpenSSL::paramnames qw(generate_public_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_CORE_NAMES_H
-# define OPENSSL_CORE_NAMES_H
-# pragma once
+#define OPENSSL_CORE_NAMES_H
+#pragma once
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /* OSSL_CIPHER_PARAM_CTS_MODE Values */
-# define OSSL_CIPHER_CTS_MODE_CS1 "CS1"
-# define OSSL_CIPHER_CTS_MODE_CS2 "CS2"
-# define OSSL_CIPHER_CTS_MODE_CS3 "CS3"
+#define OSSL_CIPHER_CTS_MODE_CS1 "CS1"
+#define OSSL_CIPHER_CTS_MODE_CS2 "CS2"
+#define OSSL_CIPHER_CTS_MODE_CS3 "CS3"
 
 /* Known CIPHER names (not a complete list) */
-# define OSSL_CIPHER_NAME_AES_128_GCM_SIV      "AES-128-GCM-SIV"
-# define OSSL_CIPHER_NAME_AES_192_GCM_SIV      "AES-192-GCM-SIV"
-# define OSSL_CIPHER_NAME_AES_256_GCM_SIV      "AES-256-GCM-SIV"
+#define OSSL_CIPHER_NAME_AES_128_GCM_SIV "AES-128-GCM-SIV"
+#define OSSL_CIPHER_NAME_AES_192_GCM_SIV "AES-192-GCM-SIV"
+#define OSSL_CIPHER_NAME_AES_256_GCM_SIV "AES-256-GCM-SIV"
 
 /* Known DIGEST names (not a complete list) */
-# define OSSL_DIGEST_NAME_MD5            "MD5"
-# define OSSL_DIGEST_NAME_MD5_SHA1       "MD5-SHA1"
-# define OSSL_DIGEST_NAME_SHA1           "SHA1"
-# define OSSL_DIGEST_NAME_SHA2_224       "SHA2-224"
-# define OSSL_DIGEST_NAME_SHA2_256       "SHA2-256"
-# define OSSL_DIGEST_NAME_SHA2_256_192   "SHA2-256/192"
-# define OSSL_DIGEST_NAME_SHA2_384       "SHA2-384"
-# define OSSL_DIGEST_NAME_SHA2_512       "SHA2-512"
-# define OSSL_DIGEST_NAME_SHA2_512_224   "SHA2-512/224"
-# define OSSL_DIGEST_NAME_SHA2_512_256   "SHA2-512/256"
-# define OSSL_DIGEST_NAME_MD2            "MD2"
-# define OSSL_DIGEST_NAME_MD4            "MD4"
-# define OSSL_DIGEST_NAME_MDC2           "MDC2"
-# define OSSL_DIGEST_NAME_RIPEMD160      "RIPEMD160"
-# define OSSL_DIGEST_NAME_SHA3_224       "SHA3-224"
-# define OSSL_DIGEST_NAME_SHA3_256       "SHA3-256"
-# define OSSL_DIGEST_NAME_SHA3_384       "SHA3-384"
-# define OSSL_DIGEST_NAME_SHA3_512       "SHA3-512"
-# define OSSL_DIGEST_NAME_KECCAK_KMAC128 "KECCAK-KMAC-128"
-# define OSSL_DIGEST_NAME_KECCAK_KMAC256 "KECCAK-KMAC-256"
-# define OSSL_DIGEST_NAME_SM3            "SM3"
+#define OSSL_DIGEST_NAME_MD5 "MD5"
+#define OSSL_DIGEST_NAME_MD5_SHA1 "MD5-SHA1"
+#define OSSL_DIGEST_NAME_SHA1 "SHA1"
+#define OSSL_DIGEST_NAME_SHA2_224 "SHA2-224"
+#define OSSL_DIGEST_NAME_SHA2_256 "SHA2-256"
+#define OSSL_DIGEST_NAME_SHA2_256_192 "SHA2-256/192"
+#define OSSL_DIGEST_NAME_SHA2_384 "SHA2-384"
+#define OSSL_DIGEST_NAME_SHA2_512 "SHA2-512"
+#define OSSL_DIGEST_NAME_SHA2_512_224 "SHA2-512/224"
+#define OSSL_DIGEST_NAME_SHA2_512_256 "SHA2-512/256"
+#define OSSL_DIGEST_NAME_MD2 "MD2"
+#define OSSL_DIGEST_NAME_MD4 "MD4"
+#define OSSL_DIGEST_NAME_MDC2 "MDC2"
+#define OSSL_DIGEST_NAME_RIPEMD160 "RIPEMD160"
+#define OSSL_DIGEST_NAME_SHA3_224 "SHA3-224"
+#define OSSL_DIGEST_NAME_SHA3_256 "SHA3-256"
+#define OSSL_DIGEST_NAME_SHA3_384 "SHA3-384"
+#define OSSL_DIGEST_NAME_SHA3_512 "SHA3-512"
+#define OSSL_DIGEST_NAME_KECCAK_KMAC128 "KECCAK-KMAC-128"
+#define OSSL_DIGEST_NAME_KECCAK_KMAC256 "KECCAK-KMAC-256"
+#define OSSL_DIGEST_NAME_SM3 "SM3"
 
 /* Known MAC names */
-# define OSSL_MAC_NAME_BLAKE2BMAC    "BLAKE2BMAC"
-# define OSSL_MAC_NAME_BLAKE2SMAC    "BLAKE2SMAC"
-# define OSSL_MAC_NAME_CMAC          "CMAC"
-# define OSSL_MAC_NAME_GMAC          "GMAC"
-# define OSSL_MAC_NAME_HMAC          "HMAC"
-# define OSSL_MAC_NAME_KMAC128       "KMAC128"
-# define OSSL_MAC_NAME_KMAC256       "KMAC256"
-# define OSSL_MAC_NAME_POLY1305      "POLY1305"
-# define OSSL_MAC_NAME_SIPHASH       "SIPHASH"
+#define OSSL_MAC_NAME_BLAKE2BMAC "BLAKE2BMAC"
+#define OSSL_MAC_NAME_BLAKE2SMAC "BLAKE2SMAC"
+#define OSSL_MAC_NAME_CMAC "CMAC"
+#define OSSL_MAC_NAME_GMAC "GMAC"
+#define OSSL_MAC_NAME_HMAC "HMAC"
+#define OSSL_MAC_NAME_KMAC128 "KMAC128"
+#define OSSL_MAC_NAME_KMAC256 "KMAC256"
+#define OSSL_MAC_NAME_POLY1305 "POLY1305"
+#define OSSL_MAC_NAME_SIPHASH "SIPHASH"
 
 /* Known KDF names */
-# define OSSL_KDF_NAME_HKDF           "HKDF"
-# define OSSL_KDF_NAME_TLS1_3_KDF     "TLS13-KDF"
-# define OSSL_KDF_NAME_PBKDF1         "PBKDF1"
-# define OSSL_KDF_NAME_PBKDF2         "PBKDF2"
-# define OSSL_KDF_NAME_SCRYPT         "SCRYPT"
-# define OSSL_KDF_NAME_SSHKDF         "SSHKDF"
-# define OSSL_KDF_NAME_SSKDF          "SSKDF"
-# define OSSL_KDF_NAME_TLS1_PRF       "TLS1-PRF"
-# define OSSL_KDF_NAME_X942KDF_ASN1   "X942KDF-ASN1"
-# define OSSL_KDF_NAME_X942KDF_CONCAT "X942KDF-CONCAT"
-# define OSSL_KDF_NAME_X963KDF        "X963KDF"
-# define OSSL_KDF_NAME_KBKDF          "KBKDF"
-# define OSSL_KDF_NAME_KRB5KDF        "KRB5KDF"
-# define OSSL_KDF_NAME_HMACDRBGKDF    "HMAC-DRBG-KDF"
+#define OSSL_KDF_NAME_HKDF "HKDF"
+#define OSSL_KDF_NAME_TLS1_3_KDF "TLS13-KDF"
+#define OSSL_KDF_NAME_PBKDF1 "PBKDF1"
+#define OSSL_KDF_NAME_PBKDF2 "PBKDF2"
+#define OSSL_KDF_NAME_SCRYPT "SCRYPT"
+#define OSSL_KDF_NAME_SSHKDF "SSHKDF"
+#define OSSL_KDF_NAME_SSKDF "SSKDF"
+#define OSSL_KDF_NAME_TLS1_PRF "TLS1-PRF"
+#define OSSL_KDF_NAME_X942KDF_ASN1 "X942KDF-ASN1"
+#define OSSL_KDF_NAME_X942KDF_CONCAT "X942KDF-CONCAT"
+#define OSSL_KDF_NAME_X963KDF "X963KDF"
+#define OSSL_KDF_NAME_KBKDF "KBKDF"
+#define OSSL_KDF_NAME_KRB5KDF "KRB5KDF"
+#define OSSL_KDF_NAME_HMACDRBGKDF "HMAC-DRBG-KDF"
 
 /* RSA padding modes */
-# define OSSL_PKEY_RSA_PAD_MODE_NONE    "none"
-# define OSSL_PKEY_RSA_PAD_MODE_PKCSV15 "pkcs1"
-# define OSSL_PKEY_RSA_PAD_MODE_OAEP    "oaep"
-# define OSSL_PKEY_RSA_PAD_MODE_X931    "x931"
-# define OSSL_PKEY_RSA_PAD_MODE_PSS     "pss"
+#define OSSL_PKEY_RSA_PAD_MODE_NONE "none"
+#define OSSL_PKEY_RSA_PAD_MODE_PKCSV15 "pkcs1"
+#define OSSL_PKEY_RSA_PAD_MODE_OAEP "oaep"
+#define OSSL_PKEY_RSA_PAD_MODE_X931 "x931"
+#define OSSL_PKEY_RSA_PAD_MODE_PSS "pss"
 
 /* RSA pss padding salt length */
-# define OSSL_PKEY_RSA_PSS_SALT_LEN_DIGEST "digest"
-# define OSSL_PKEY_RSA_PSS_SALT_LEN_MAX    "max"
-# define OSSL_PKEY_RSA_PSS_SALT_LEN_AUTO   "auto"
-# define OSSL_PKEY_RSA_PSS_SALT_LEN_AUTO_DIGEST_MAX "auto-digestmax"
+#define OSSL_PKEY_RSA_PSS_SALT_LEN_DIGEST "digest"
+#define OSSL_PKEY_RSA_PSS_SALT_LEN_MAX "max"
+#define OSSL_PKEY_RSA_PSS_SALT_LEN_AUTO "auto"
+#define OSSL_PKEY_RSA_PSS_SALT_LEN_AUTO_DIGEST_MAX "auto-digestmax"
 
 /* OSSL_PKEY_PARAM_EC_ENCODING values */
-# define OSSL_PKEY_EC_ENCODING_EXPLICIT  "explicit"
-# define OSSL_PKEY_EC_ENCODING_GROUP     "named_curve"
+#define OSSL_PKEY_EC_ENCODING_EXPLICIT "explicit"
+#define OSSL_PKEY_EC_ENCODING_GROUP "named_curve"
 
-# define OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_UNCOMPRESSED "uncompressed"
-# define OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_COMPRESSED   "compressed"
-# define OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_HYBRID       "hybrid"
+#define OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_UNCOMPRESSED "uncompressed"
+#define OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_COMPRESSED "compressed"
+#define OSSL_PKEY_EC_POINT_CONVERSION_FORMAT_HYBRID "hybrid"
 
-# define OSSL_PKEY_EC_GROUP_CHECK_DEFAULT     "default"
-# define OSSL_PKEY_EC_GROUP_CHECK_NAMED       "named"
-# define OSSL_PKEY_EC_GROUP_CHECK_NAMED_NIST  "named-nist"
+#define OSSL_PKEY_EC_GROUP_CHECK_DEFAULT "default"
+#define OSSL_PKEY_EC_GROUP_CHECK_NAMED "named"
+#define OSSL_PKEY_EC_GROUP_CHECK_NAMED_NIST "named-nist"
 
 /* PROV_SKEY well known key types */
-# define OSSL_SKEY_TYPE_GENERIC             "GENERIC-SECRET"
-# define OSSL_SKEY_TYPE_AES                 "AES"
+#define OSSL_SKEY_TYPE_GENERIC "GENERIC-SECRET"
+#define OSSL_SKEY_TYPE_AES "AES"
 
 /* OSSL_KEM_PARAM_OPERATION values */
-#define OSSL_KEM_PARAM_OPERATION_RSASVE     "RSASVE"
-#define OSSL_KEM_PARAM_OPERATION_DHKEM      "DHKEM"
+#define OSSL_KEM_PARAM_OPERATION_RSASVE "RSASVE"
+#define OSSL_KEM_PARAM_OPERATION_DHKEM "DHKEM"
 
 /* Provider configuration variables */
-#define OSSL_PKEY_RETAIN_SEED   "pkey_retain_seed"
+#define OSSL_PKEY_RETAIN_SEED "pkey_retain_seed"
 
 /* Parameter name definitions - generated by util/perl/OpenSSL/paramnames.pm */
+/* clang-format off */
 {- generate_public_macros(); -}
+/* clang-format on */
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/core_object.h b/include/openssl/core_object.h
index 62ccf39d3259..df0c79436d88 100644
--- a/include/openssl/core_object.h
+++ b/include/openssl/core_object.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OPENSSL_CORE_OBJECT_H
-# define OPENSSL_CORE_OBJECT_H
-# pragma once
+#define OPENSSL_CORE_OBJECT_H
+#pragma once
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*-
  * Known object types
@@ -24,18 +24,18 @@ extern "C" {
  * For most of these types, there's a corresponding libcrypto object type.
  * The corresponding type is indicated with a comment after the number.
  */
-# define OSSL_OBJECT_UNKNOWN            0
-# define OSSL_OBJECT_NAME               1 /* char * */
-# define OSSL_OBJECT_PKEY               2 /* EVP_PKEY * */
-# define OSSL_OBJECT_CERT               3 /* X509 * */
-# define OSSL_OBJECT_CRL                4 /* X509_CRL * */
+#define OSSL_OBJECT_UNKNOWN 0
+#define OSSL_OBJECT_NAME 1 /* char * */
+#define OSSL_OBJECT_PKEY 2 /* EVP_PKEY * */
+#define OSSL_OBJECT_CERT 3 /* X509 * */
+#define OSSL_OBJECT_CRL 4 /* X509_CRL * */
 
 /*
  * The rest of the associated OSSL_PARAM elements is described in core_names.h
  */
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/crmf.h.in b/include/openssl/crmf.h.in
index 3fab255a3fd5..3d9cbf4320b5 100644
--- a/include/openssl/crmf.h.in
+++ b/include/openssl/crmf.h.in
@@ -13,38 +13,40 @@
  * CRMF (RFC 4211) implementation by M. Peylo, M. Viljanen, and D. von Oheimb.
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_CRMF_H
-# define OPENSSL_CRMF_H
+#define OPENSSL_CRMF_H
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_CRMF
-#  include <openssl/opensslv.h>
-#  include <openssl/safestack.h>
-#  include <openssl/crmferr.h>
-#  include <openssl/x509v3.h> /* for GENERAL_NAME etc. */
-#  include <openssl/cms.h>
+#ifndef OPENSSL_NO_CRMF
+#include <openssl/opensslv.h>
+#include <openssl/safestack.h>
+#include <openssl/crmferr.h>
+#include <openssl/x509v3.h> /* for GENERAL_NAME etc. */
+#include <openssl/cms.h>
 
 /* explicit #includes not strictly needed since implied by the above: */
-#  include <openssl/types.h>
-#  include <openssl/x509.h>
+#include <openssl/types.h>
+#include <openssl/x509.h>
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define OSSL_CRMF_POPOPRIVKEY_THISMESSAGE          0
-#  define OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE    1
-#  define OSSL_CRMF_POPOPRIVKEY_DHMAC                2
-#  define OSSL_CRMF_POPOPRIVKEY_AGREEMAC             3
-#  define OSSL_CRMF_POPOPRIVKEY_ENCRYPTEDKEY         4
+#define OSSL_CRMF_POPOPRIVKEY_THISMESSAGE 0
+#define OSSL_CRMF_POPOPRIVKEY_SUBSEQUENTMESSAGE 1
+#define OSSL_CRMF_POPOPRIVKEY_DHMAC 2
+#define OSSL_CRMF_POPOPRIVKEY_AGREEMAC 3
+#define OSSL_CRMF_POPOPRIVKEY_ENCRYPTEDKEY 4
 
-#  define OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT       0
-#  define OSSL_CRMF_SUBSEQUENTMESSAGE_CHALLENGERESP  1
+#define OSSL_CRMF_SUBSEQUENTMESSAGE_ENCRCERT 0
+#define OSSL_CRMF_SUBSEQUENTMESSAGE_CHALLENGERESP 1
 typedef struct ossl_crmf_encryptedvalue_st OSSL_CRMF_ENCRYPTEDVALUE;
 DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_ENCRYPTEDVALUE)
 
@@ -54,15 +56,19 @@ DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_ENCRYPTEDKEY)
 typedef struct ossl_crmf_msg_st OSSL_CRMF_MSG;
 DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_MSG)
 DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_MSG)
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CRMF_MSG");
 -}
+/* clang-format on */
 typedef struct ossl_crmf_attributetypeandvalue_st OSSL_CRMF_ATTRIBUTETYPEANDVALUE;
 void OSSL_CRMF_ATTRIBUTETYPEANDVALUE_free(OSSL_CRMF_ATTRIBUTETYPEANDVALUE *v);
 DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_ATTRIBUTETYPEANDVALUE)
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CRMF_ATTRIBUTETYPEANDVALUE");
 -}
+/* clang-format on */
 
 typedef struct ossl_crmf_pbmparameter_st OSSL_CRMF_PBMPARAMETER;
 DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PBMPARAMETER)
@@ -71,9 +77,11 @@ typedef struct ossl_crmf_certrequest_st OSSL_CRMF_CERTREQUEST;
 typedef struct ossl_crmf_certid_st OSSL_CRMF_CERTID;
 DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_CERTID)
 DECLARE_ASN1_DUP_FUNCTION(OSSL_CRMF_CERTID)
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_CRMF_CERTID");
 -}
+/* clang-format on */
 
 typedef struct ossl_crmf_pkipublicationinfo_st OSSL_CRMF_PKIPUBLICATIONINFO;
 DECLARE_ASN1_FUNCTIONS(OSSL_CRMF_PKIPUBLICATIONINFO)
@@ -89,119 +97,112 @@ typedef struct ossl_crmf_optionalvalidity_st OSSL_CRMF_OPTIONALVALIDITY;
 
 /* crmf_pbm.c */
 OSSL_CRMF_PBMPARAMETER *OSSL_CRMF_pbmp_new(OSSL_LIB_CTX *libctx, size_t slen,
-                                           int owfnid, size_t itercnt,
-                                           int macnid);
+    int owfnid, size_t itercnt,
+    int macnid);
 int OSSL_CRMF_pbm_new(OSSL_LIB_CTX *libctx, const char *propq,
-                      const OSSL_CRMF_PBMPARAMETER *pbmp,
-                      const unsigned char *msg, size_t msglen,
-                      const unsigned char *sec, size_t seclen,
-                      unsigned char **mac, size_t *maclen);
+    const OSSL_CRMF_PBMPARAMETER *pbmp,
+    const unsigned char *msg, size_t msglen,
+    const unsigned char *sec, size_t seclen,
+    unsigned char **mac, size_t *maclen);
 
 /* crmf_lib.c */
 int OSSL_CRMF_MSG_set1_regCtrl_regToken(OSSL_CRMF_MSG *msg,
-                                        const ASN1_UTF8STRING *tok);
+    const ASN1_UTF8STRING *tok);
 ASN1_UTF8STRING
 *OSSL_CRMF_MSG_get0_regCtrl_regToken(const OSSL_CRMF_MSG *msg);
 int OSSL_CRMF_MSG_set1_regCtrl_authenticator(OSSL_CRMF_MSG *msg,
-                                             const ASN1_UTF8STRING *auth);
+    const ASN1_UTF8STRING *auth);
 ASN1_UTF8STRING
 *OSSL_CRMF_MSG_get0_regCtrl_authenticator(const OSSL_CRMF_MSG *msg);
-int
-OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
-                                                     OSSL_CRMF_SINGLEPUBINFO *spi);
-#  define OSSL_CRMF_PUB_METHOD_DONTCARE 0
-#  define OSSL_CRMF_PUB_METHOD_X500     1
-#  define OSSL_CRMF_PUB_METHOD_WEB      2
-#  define OSSL_CRMF_PUB_METHOD_LDAP     3
+int OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
+    OSSL_CRMF_SINGLEPUBINFO *spi);
+#define OSSL_CRMF_PUB_METHOD_DONTCARE 0
+#define OSSL_CRMF_PUB_METHOD_X500 1
+#define OSSL_CRMF_PUB_METHOD_WEB 2
+#define OSSL_CRMF_PUB_METHOD_LDAP 3
 int OSSL_CRMF_MSG_set0_SinglePubInfo(OSSL_CRMF_SINGLEPUBINFO *spi,
-                                     int method, GENERAL_NAME *nm);
-#  define OSSL_CRMF_PUB_ACTION_DONTPUBLISH   0
-#  define OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH 1
+    int method, GENERAL_NAME *nm);
+#define OSSL_CRMF_PUB_ACTION_DONTPUBLISH 0
+#define OSSL_CRMF_PUB_ACTION_PLEASEPUBLISH 1
 int OSSL_CRMF_MSG_set_PKIPublicationInfo_action(OSSL_CRMF_PKIPUBLICATIONINFO *pi,
-                                                int action);
+    int action);
 int OSSL_CRMF_MSG_set1_regCtrl_pkiPublicationInfo(OSSL_CRMF_MSG *msg,
-                                                  const OSSL_CRMF_PKIPUBLICATIONINFO *pi);
+    const OSSL_CRMF_PKIPUBLICATIONINFO *pi);
 OSSL_CRMF_PKIPUBLICATIONINFO
 *OSSL_CRMF_MSG_get0_regCtrl_pkiPublicationInfo(const OSSL_CRMF_MSG *msg);
 int OSSL_CRMF_MSG_set1_regCtrl_protocolEncrKey(OSSL_CRMF_MSG *msg,
-                                               const X509_PUBKEY *pubkey);
+    const X509_PUBKEY *pubkey);
 X509_PUBKEY
 *OSSL_CRMF_MSG_get0_regCtrl_protocolEncrKey(const OSSL_CRMF_MSG *msg);
 int OSSL_CRMF_MSG_set1_regCtrl_oldCertID(OSSL_CRMF_MSG *msg,
-                                         const OSSL_CRMF_CERTID *cid);
+    const OSSL_CRMF_CERTID *cid);
 OSSL_CRMF_CERTID
 *OSSL_CRMF_MSG_get0_regCtrl_oldCertID(const OSSL_CRMF_MSG *msg);
 OSSL_CRMF_CERTID *OSSL_CRMF_CERTID_gen(const X509_NAME *issuer,
-                                       const ASN1_INTEGER *serial);
+    const ASN1_INTEGER *serial);
 
 int OSSL_CRMF_MSG_set1_regInfo_utf8Pairs(OSSL_CRMF_MSG *msg,
-                                         const ASN1_UTF8STRING *utf8pairs);
+    const ASN1_UTF8STRING *utf8pairs);
 ASN1_UTF8STRING
 *OSSL_CRMF_MSG_get0_regInfo_utf8Pairs(const OSSL_CRMF_MSG *msg);
 int OSSL_CRMF_MSG_set1_regInfo_certReq(OSSL_CRMF_MSG *msg,
-                                       const OSSL_CRMF_CERTREQUEST *cr);
+    const OSSL_CRMF_CERTREQUEST *cr);
 OSSL_CRMF_CERTREQUEST
 *OSSL_CRMF_MSG_get0_regInfo_certReq(const OSSL_CRMF_MSG *msg);
 
 int OSSL_CRMF_MSG_set0_validity(OSSL_CRMF_MSG *crm,
-                                ASN1_TIME *notBefore, ASN1_TIME *notAfter);
+    ASN1_TIME *notBefore, ASN1_TIME *notAfter);
 int OSSL_CRMF_MSG_set_certReqId(OSSL_CRMF_MSG *crm, int rid);
 int OSSL_CRMF_MSG_get_certReqId(const OSSL_CRMF_MSG *crm);
 int OSSL_CRMF_MSG_set0_extensions(OSSL_CRMF_MSG *crm, X509_EXTENSIONS *exts);
 
 int OSSL_CRMF_MSG_push0_extension(OSSL_CRMF_MSG *crm, X509_EXTENSION *ext);
-#  define OSSL_CRMF_POPO_NONE       -1
-#  define OSSL_CRMF_POPO_RAVERIFIED 0
-#  define OSSL_CRMF_POPO_SIGNATURE  1
-#  define OSSL_CRMF_POPO_KEYENC     2
-#  define OSSL_CRMF_POPO_KEYAGREE   3
+#define OSSL_CRMF_POPO_NONE -1
+#define OSSL_CRMF_POPO_RAVERIFIED 0
+#define OSSL_CRMF_POPO_SIGNATURE 1
+#define OSSL_CRMF_POPO_KEYENC 2
+#define OSSL_CRMF_POPO_KEYAGREE 3
 int OSSL_CRMF_MSG_create_popo(int meth, OSSL_CRMF_MSG *crm,
-                              EVP_PKEY *pkey, const EVP_MD *digest,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    EVP_PKEY *pkey, const EVP_MD *digest,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OSSL_CRMF_MSGS_verify_popo(const OSSL_CRMF_MSGS *reqs,
-                               int rid, int acceptRAVerified,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    int rid, int acceptRAVerified,
+    OSSL_LIB_CTX *libctx, const char *propq);
 OSSL_CRMF_CERTTEMPLATE *OSSL_CRMF_MSG_get0_tmpl(const OSSL_CRMF_MSG *crm);
 X509_PUBKEY
 *OSSL_CRMF_CERTTEMPLATE_get0_publicKey(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const X509_NAME
-*OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const ASN1_INTEGER
-*OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl);
+const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_subject(const OSSL_CRMF_CERTTEMPLATE *tmpl);
+const X509_NAME *OSSL_CRMF_CERTTEMPLATE_get0_issuer(const OSSL_CRMF_CERTTEMPLATE *tmpl);
+const ASN1_INTEGER *OSSL_CRMF_CERTTEMPLATE_get0_serialNumber(const OSSL_CRMF_CERTTEMPLATE *tmpl);
 X509_EXTENSIONS
 *OSSL_CRMF_CERTTEMPLATE_get0_extensions(const OSSL_CRMF_CERTTEMPLATE *tmpl);
-const X509_NAME
-*OSSL_CRMF_CERTID_get0_issuer(const OSSL_CRMF_CERTID *cid);
-const ASN1_INTEGER
-*OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID *cid);
+const X509_NAME *OSSL_CRMF_CERTID_get0_issuer(const OSSL_CRMF_CERTID *cid);
+const ASN1_INTEGER *OSSL_CRMF_CERTID_get0_serialNumber(const OSSL_CRMF_CERTID *cid);
 int OSSL_CRMF_CERTTEMPLATE_fill(OSSL_CRMF_CERTTEMPLATE *tmpl,
-                                EVP_PKEY *pubkey,
-                                const X509_NAME *subject,
-                                const X509_NAME *issuer,
-                                const ASN1_INTEGER *serial);
+    EVP_PKEY *pubkey,
+    const X509_NAME *subject,
+    const X509_NAME *issuer,
+    const ASN1_INTEGER *serial);
 X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(const OSSL_CRMF_ENCRYPTEDVALUE *ecert,
-                                            OSSL_LIB_CTX *libctx, const char *propq,
-                                            EVP_PKEY *pkey);
+    OSSL_LIB_CTX *libctx, const char *propq,
+    EVP_PKEY *pkey);
 X509 *OSSL_CRMF_ENCRYPTEDKEY_get1_encCert(const OSSL_CRMF_ENCRYPTEDKEY *ecert,
-                                          OSSL_LIB_CTX *libctx, const char *propq,
-                                          EVP_PKEY *pkey, unsigned int flags);
-unsigned char
-*OSSL_CRMF_ENCRYPTEDVALUE_decrypt(const OSSL_CRMF_ENCRYPTEDVALUE *enc,
-                                  OSSL_LIB_CTX *libctx, const char *propq,
-                                  EVP_PKEY *pkey, int *outlen);
+    OSSL_LIB_CTX *libctx, const char *propq,
+    EVP_PKEY *pkey, unsigned int flags);
+unsigned char *OSSL_CRMF_ENCRYPTEDVALUE_decrypt(const OSSL_CRMF_ENCRYPTEDVALUE *enc,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    EVP_PKEY *pkey, int *outlen);
 EVP_PKEY *OSSL_CRMF_ENCRYPTEDKEY_get1_pkey(const OSSL_CRMF_ENCRYPTEDKEY *encryptedKey,
-                                           X509_STORE *ts, STACK_OF(X509) *extra, EVP_PKEY *pkey,
-                                           X509 *cert, ASN1_OCTET_STRING *secret,
-                                           OSSL_LIB_CTX *libctx, const char *propq);
+    X509_STORE *ts, STACK_OF(X509) *extra, EVP_PKEY *pkey,
+    X509 *cert, ASN1_OCTET_STRING *secret,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OSSL_CRMF_MSG_centralkeygen_requested(const OSSL_CRMF_MSG *crm, const X509_REQ *p10cr);
-#  ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
 OSSL_CRMF_ENCRYPTEDKEY *OSSL_CRMF_ENCRYPTEDKEY_init_envdata(CMS_EnvelopedData *envdata);
-#  endif
+#endif
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif /* !defined(OPENSSL_NO_CRMF) */
+#endif
+#endif /* !defined(OPENSSL_NO_CRMF) */
 #endif /* !defined(OPENSSL_CRMF_H) */
diff --git a/include/openssl/crmferr.h b/include/openssl/crmferr.h
index a9b04e0ebb21..22153940eeb9 100644
--- a/include/openssl/crmferr.h
+++ b/include/openssl/crmferr.h
@@ -9,49 +9,47 @@
  */
 
 #ifndef OPENSSL_CRMFERR_H
-# define OPENSSL_CRMFERR_H
-# pragma once
+#define OPENSSL_CRMFERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_CRMF
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_CRMF
 
 /*
  * CRMF reason codes.
  */
-#  define CRMF_R_BAD_PBM_ITERATIONCOUNT                    100
-#  define CRMF_R_CMS_NOT_SUPPORTED                         122
-#  define CRMF_R_CRMFERROR                                 102
-#  define CRMF_R_ERROR                                     103
-#  define CRMF_R_ERROR_DECODING_CERTIFICATE                104
-#  define CRMF_R_ERROR_DECODING_ENCRYPTEDKEY               123
-#  define CRMF_R_ERROR_DECRYPTING_CERTIFICATE              105
-#  define CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY             124
-#  define CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE           125
-#  define CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY            106
-#  define CRMF_R_ERROR_SETTING_PURPOSE                     126
-#  define CRMF_R_ERROR_VERIFYING_ENCRYPTEDKEY              127
-#  define CRMF_R_FAILURE_OBTAINING_RANDOM                  107
-#  define CRMF_R_ITERATIONCOUNT_BELOW_100                  108
-#  define CRMF_R_MALFORMED_IV                              101
-#  define CRMF_R_NULL_ARGUMENT                             109
-#  define CRMF_R_POPOSKINPUT_NOT_SUPPORTED                 113
-#  define CRMF_R_POPO_INCONSISTENT_CENTRAL_KEYGEN          128
-#  define CRMF_R_POPO_INCONSISTENT_PUBLIC_KEY              117
-#  define CRMF_R_POPO_MISSING                              121
-#  define CRMF_R_POPO_MISSING_PUBLIC_KEY                   118
-#  define CRMF_R_POPO_MISSING_SUBJECT                      119
-#  define CRMF_R_POPO_RAVERIFIED_NOT_ACCEPTED              120
-#  define CRMF_R_SETTING_MAC_ALGOR_FAILURE                 110
-#  define CRMF_R_SETTING_OWF_ALGOR_FAILURE                 111
-#  define CRMF_R_UNSUPPORTED_ALGORITHM                     112
-#  define CRMF_R_UNSUPPORTED_CIPHER                        114
-#  define CRMF_R_UNSUPPORTED_METHOD_FOR_CREATING_POPO      115
-#  define CRMF_R_UNSUPPORTED_POPO_METHOD                   116
+#define CRMF_R_BAD_PBM_ITERATIONCOUNT 100
+#define CRMF_R_CMS_NOT_SUPPORTED 122
+#define CRMF_R_CRMFERROR 102
+#define CRMF_R_ERROR 103
+#define CRMF_R_ERROR_DECODING_CERTIFICATE 104
+#define CRMF_R_ERROR_DECODING_ENCRYPTEDKEY 123
+#define CRMF_R_ERROR_DECRYPTING_CERTIFICATE 105
+#define CRMF_R_ERROR_DECRYPTING_ENCRYPTEDKEY 124
+#define CRMF_R_ERROR_DECRYPTING_ENCRYPTEDVALUE 125
+#define CRMF_R_ERROR_DECRYPTING_SYMMETRIC_KEY 106
+#define CRMF_R_ERROR_SETTING_PURPOSE 126
+#define CRMF_R_ERROR_VERIFYING_ENCRYPTEDKEY 127
+#define CRMF_R_FAILURE_OBTAINING_RANDOM 107
+#define CRMF_R_ITERATIONCOUNT_BELOW_100 108
+#define CRMF_R_MALFORMED_IV 101
+#define CRMF_R_NULL_ARGUMENT 109
+#define CRMF_R_POPOSKINPUT_NOT_SUPPORTED 113
+#define CRMF_R_POPO_INCONSISTENT_CENTRAL_KEYGEN 128
+#define CRMF_R_POPO_INCONSISTENT_PUBLIC_KEY 117
+#define CRMF_R_POPO_MISSING 121
+#define CRMF_R_POPO_MISSING_PUBLIC_KEY 118
+#define CRMF_R_POPO_MISSING_SUBJECT 119
+#define CRMF_R_POPO_RAVERIFIED_NOT_ACCEPTED 120
+#define CRMF_R_SETTING_MAC_ALGOR_FAILURE 110
+#define CRMF_R_SETTING_OWF_ALGOR_FAILURE 111
+#define CRMF_R_UNSUPPORTED_ALGORITHM 112
+#define CRMF_R_UNSUPPORTED_CIPHER 114
+#define CRMF_R_UNSUPPORTED_METHOD_FOR_CREATING_POPO 115
+#define CRMF_R_UNSUPPORTED_POPO_METHOD 116
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/crypto.h.in b/include/openssl/crypto.h.in
index c98f5215d54b..696eabb5b49e 100644
--- a/include/openssl/crypto.h.in
+++ b/include/openssl/crypto.h.in
@@ -10,62 +10,64 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_CRYPTO_H
-# define OPENSSL_CRYPTO_H
-# pragma once
+#define OPENSSL_CRYPTO_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CRYPTO_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CRYPTO_H
+#endif
 
-# include <stdlib.h>
-# include <time.h>
+#include <stdlib.h>
+#include <time.h>
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-# include <openssl/safestack.h>
-# include <openssl/opensslv.h>
-# include <openssl/types.h>
-# include <openssl/opensslconf.h>
-# include <openssl/cryptoerr.h>
-# include <openssl/core.h>
+#include <openssl/safestack.h>
+#include <openssl/opensslv.h>
+#include <openssl/types.h>
+#include <openssl/opensslconf.h>
+#include <openssl/cryptoerr.h>
+#include <openssl/core.h>
 
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
 
 /*
  * Resolve problems on some operating systems with symbol names that clash
  * one way or another
  */
-# include <openssl/symhacks.h>
+#include <openssl/symhacks.h>
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  include <openssl/opensslv.h>
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/opensslv.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define SSLeay                  OpenSSL_version_num
-#  define SSLeay_version          OpenSSL_version
-#  define SSLEAY_VERSION_NUMBER   OPENSSL_VERSION_NUMBER
-#  define SSLEAY_VERSION          OPENSSL_VERSION
-#  define SSLEAY_CFLAGS           OPENSSL_CFLAGS
-#  define SSLEAY_BUILT_ON         OPENSSL_BUILT_ON
-#  define SSLEAY_PLATFORM         OPENSSL_PLATFORM
-#  define SSLEAY_DIR              OPENSSL_DIR
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define SSLeay OpenSSL_version_num
+#define SSLeay_version OpenSSL_version
+#define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
+#define SSLEAY_VERSION OPENSSL_VERSION
+#define SSLEAY_CFLAGS OPENSSL_CFLAGS
+#define SSLEAY_BUILT_ON OPENSSL_BUILT_ON
+#define SSLEAY_PLATFORM OPENSSL_PLATFORM
+#define SSLEAY_DIR OPENSSL_DIR
 
 /*
  * Old type for allocating dynamic locks. No longer used. Use the new thread
@@ -75,7 +77,7 @@ typedef struct {
     int dummy;
 } CRYPTO_dynlock;
 
-# endif /* OPENSSL_NO_DEPRECATED_1_1_0 */
+#endif /* OPENSSL_NO_DEPRECATED_1_1_0 */
 
 typedef void CRYPTO_RWLOCK;
 
@@ -87,66 +89,68 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock);
 
 int CRYPTO_atomic_add(int *val, int amount, int *ret, CRYPTO_RWLOCK *lock);
 int CRYPTO_atomic_add64(uint64_t *val, uint64_t op, uint64_t *ret,
-                        CRYPTO_RWLOCK *lock);
+    CRYPTO_RWLOCK *lock);
 int CRYPTO_atomic_and(uint64_t *val, uint64_t op, uint64_t *ret,
-                      CRYPTO_RWLOCK *lock);
+    CRYPTO_RWLOCK *lock);
 int CRYPTO_atomic_or(uint64_t *val, uint64_t op, uint64_t *ret,
-                     CRYPTO_RWLOCK *lock);
+    CRYPTO_RWLOCK *lock);
 int CRYPTO_atomic_load(uint64_t *val, uint64_t *ret, CRYPTO_RWLOCK *lock);
 int CRYPTO_atomic_load_int(int *val, int *ret, CRYPTO_RWLOCK *lock);
 int CRYPTO_atomic_store(uint64_t *dst, uint64_t val, CRYPTO_RWLOCK *lock);
 
 /* No longer needed, so this is a no-op */
-#define OPENSSL_malloc_init() while(0) continue
+#define OPENSSL_malloc_init() \
+    while (0)                 \
+    continue
 
-# define OPENSSL_malloc(num) \
-        CRYPTO_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_zalloc(num) \
-        CRYPTO_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_aligned_alloc(num, alignment, freeptr) \
-        CRYPTO_aligned_alloc(num, alignment, freeptr, \
-                             OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_realloc(addr, num) \
-        CRYPTO_realloc(addr, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_clear_realloc(addr, old_num, num) \
-        CRYPTO_clear_realloc(addr, old_num, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_clear_free(addr, num) \
-        CRYPTO_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_free(addr) \
-        CRYPTO_free(addr, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_memdup(str, s) \
-        CRYPTO_memdup((str), s, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_strdup(str) \
-        CRYPTO_strdup(str, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_strndup(str, n) \
-        CRYPTO_strndup(str, n, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_malloc(num) \
-        CRYPTO_secure_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_zalloc(num) \
-        CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_free(addr) \
-        CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_clear_free(addr, num) \
-        CRYPTO_secure_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
-# define OPENSSL_secure_actual_size(ptr) \
-        CRYPTO_secure_actual_size(ptr)
+#define OPENSSL_malloc(num) \
+    CRYPTO_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_zalloc(num) \
+    CRYPTO_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_aligned_alloc(num, alignment, freeptr) \
+    CRYPTO_aligned_alloc(num, alignment, freeptr,      \
+        OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_realloc(addr, num) \
+    CRYPTO_realloc(addr, num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_clear_realloc(addr, old_num, num) \
+    CRYPTO_clear_realloc(addr, old_num, num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_clear_free(addr, num) \
+    CRYPTO_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_free(addr) \
+    CRYPTO_free(addr, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_memdup(str, s) \
+    CRYPTO_memdup((str), s, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_strdup(str) \
+    CRYPTO_strdup(str, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_strndup(str, n) \
+    CRYPTO_strndup(str, n, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_secure_malloc(num) \
+    CRYPTO_secure_malloc(num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_secure_zalloc(num) \
+    CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_secure_free(addr) \
+    CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_secure_clear_free(addr, num) \
+    CRYPTO_secure_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_secure_actual_size(ptr) \
+    CRYPTO_secure_actual_size(ptr)
 
 size_t OPENSSL_strlcpy(char *dst, const char *src, size_t siz);
 size_t OPENSSL_strlcat(char *dst, const char *src, size_t siz);
 size_t OPENSSL_strnlen(const char *str, size_t maxlen);
 int OPENSSL_strtoul(const char *str, char **endptr, int base, unsigned long *num);
 int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlength,
-                          const unsigned char *buf, size_t buflen,
-                          const char sep);
+    const unsigned char *buf, size_t buflen,
+    const char sep);
 char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen);
 int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
-                          const char *str, const char sep);
+    const char *str, const char sep);
 unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen);
 int OPENSSL_hexchar2int(unsigned char c);
 int OPENSSL_strcasecmp(const char *s1, const char *s2);
 int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n);
 
-# define OPENSSL_MALLOC_MAX_NELEMS(type)  (((1U<<(sizeof(int)*8-1))-1)/sizeof(type))
+#define OPENSSL_MALLOC_MAX_NELEMS(type) (((1U << (sizeof(int) * 8 - 1)) - 1) / sizeof(type))
 
 /*
  * These functions return the values of OPENSSL_VERSION_MAJOR,
@@ -161,32 +165,32 @@ const char *OPENSSL_version_build_metadata(void);
 
 unsigned long OpenSSL_version_num(void);
 const char *OpenSSL_version(int type);
-# define OPENSSL_VERSION                0
-# define OPENSSL_CFLAGS                 1
-# define OPENSSL_BUILT_ON               2
-# define OPENSSL_PLATFORM               3
-# define OPENSSL_DIR                    4
-# define OPENSSL_ENGINES_DIR            5
-# define OPENSSL_VERSION_STRING         6
-# define OPENSSL_FULL_VERSION_STRING    7
-# define OPENSSL_MODULES_DIR            8
-# define OPENSSL_CPU_INFO               9
-# define OPENSSL_WINCTX             	10
+#define OPENSSL_VERSION 0
+#define OPENSSL_CFLAGS 1
+#define OPENSSL_BUILT_ON 2
+#define OPENSSL_PLATFORM 3
+#define OPENSSL_DIR 4
+#define OPENSSL_ENGINES_DIR 5
+#define OPENSSL_VERSION_STRING 6
+#define OPENSSL_FULL_VERSION_STRING 7
+#define OPENSSL_MODULES_DIR 8
+#define OPENSSL_CPU_INFO 9
+#define OPENSSL_WINCTX 10
 
 const char *OPENSSL_info(int type);
 /*
  * The series starts at 1001 to avoid confusion with the OpenSSL_version
  * types.
  */
-# define OPENSSL_INFO_CONFIG_DIR                1001
-# define OPENSSL_INFO_ENGINES_DIR               1002
-# define OPENSSL_INFO_MODULES_DIR               1003
-# define OPENSSL_INFO_DSO_EXTENSION             1004
-# define OPENSSL_INFO_DIR_FILENAME_SEPARATOR    1005
-# define OPENSSL_INFO_LIST_SEPARATOR            1006
-# define OPENSSL_INFO_SEED_SOURCE               1007
-# define OPENSSL_INFO_CPU_SETTINGS              1008
-# define OPENSSL_INFO_WINDOWS_CONTEXT           1009
+#define OPENSSL_INFO_CONFIG_DIR 1001
+#define OPENSSL_INFO_ENGINES_DIR 1002
+#define OPENSSL_INFO_MODULES_DIR 1003
+#define OPENSSL_INFO_DSO_EXTENSION 1004
+#define OPENSSL_INFO_DIR_FILENAME_SEPARATOR 1005
+#define OPENSSL_INFO_LIST_SEPARATOR 1006
+#define OPENSSL_INFO_SEED_SOURCE 1007
+#define OPENSSL_INFO_CPU_SETTINGS 1008
+#define OPENSSL_INFO_WINDOWS_CONTEXT 1009
 
 int OPENSSL_issetugid(void);
 
@@ -195,45 +199,46 @@ struct crypto_ex_data_st {
     STACK_OF(void) *sk;
 };
 
+/* clang-format off */
 {-
     generate_stack_macros("void");
 -}
-
+/* clang-format on */
 
 /*
  * Per class, we have a STACK of function pointers.
  */
-# define CRYPTO_EX_INDEX_SSL              0
-# define CRYPTO_EX_INDEX_SSL_CTX          1
-# define CRYPTO_EX_INDEX_SSL_SESSION      2
-# define CRYPTO_EX_INDEX_X509             3
-# define CRYPTO_EX_INDEX_X509_STORE       4
-# define CRYPTO_EX_INDEX_X509_STORE_CTX   5
-# define CRYPTO_EX_INDEX_DH               6
-# define CRYPTO_EX_INDEX_DSA              7
-# define CRYPTO_EX_INDEX_EC_KEY           8
-# define CRYPTO_EX_INDEX_RSA              9
-# define CRYPTO_EX_INDEX_ENGINE          10
-# define CRYPTO_EX_INDEX_UI              11
-# define CRYPTO_EX_INDEX_BIO             12
-# define CRYPTO_EX_INDEX_APP             13
-# define CRYPTO_EX_INDEX_UI_METHOD       14
-# define CRYPTO_EX_INDEX_RAND_DRBG       15
-# define CRYPTO_EX_INDEX_DRBG            CRYPTO_EX_INDEX_RAND_DRBG
-# define CRYPTO_EX_INDEX_OSSL_LIB_CTX    16
-# define CRYPTO_EX_INDEX_EVP_PKEY        17
-# define CRYPTO_EX_INDEX__COUNT          18
+#define CRYPTO_EX_INDEX_SSL 0
+#define CRYPTO_EX_INDEX_SSL_CTX 1
+#define CRYPTO_EX_INDEX_SSL_SESSION 2
+#define CRYPTO_EX_INDEX_X509 3
+#define CRYPTO_EX_INDEX_X509_STORE 4
+#define CRYPTO_EX_INDEX_X509_STORE_CTX 5
+#define CRYPTO_EX_INDEX_DH 6
+#define CRYPTO_EX_INDEX_DSA 7
+#define CRYPTO_EX_INDEX_EC_KEY 8
+#define CRYPTO_EX_INDEX_RSA 9
+#define CRYPTO_EX_INDEX_ENGINE 10
+#define CRYPTO_EX_INDEX_UI 11
+#define CRYPTO_EX_INDEX_BIO 12
+#define CRYPTO_EX_INDEX_APP 13
+#define CRYPTO_EX_INDEX_UI_METHOD 14
+#define CRYPTO_EX_INDEX_RAND_DRBG 15
+#define CRYPTO_EX_INDEX_DRBG CRYPTO_EX_INDEX_RAND_DRBG
+#define CRYPTO_EX_INDEX_OSSL_LIB_CTX 16
+#define CRYPTO_EX_INDEX_EVP_PKEY 17
+#define CRYPTO_EX_INDEX__COUNT 18
 
-typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                           int idx, long argl, void *argp);
-typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                             int idx, long argl, void *argp);
-typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
-                           void **from_d, int idx, long argl, void *argp);
+typedef void CRYPTO_EX_new(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
+    int idx, long argl, void *argp);
+typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,
+    int idx, long argl, void *argp);
+typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
+    void **from_d, int idx, long argl, void *argp);
 __owur int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
-                                   CRYPTO_EX_new *new_func,
-                                   CRYPTO_EX_dup *dup_func,
-                                   CRYPTO_EX_free *free_func);
+    CRYPTO_EX_new *new_func,
+    CRYPTO_EX_dup *dup_func,
+    CRYPTO_EX_free *free_func);
 /* No longer use an index. */
 int CRYPTO_free_ex_index(int class_index, int idx);
 
@@ -243,13 +248,13 @@ int CRYPTO_free_ex_index(int class_index, int idx);
  */
 int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
 int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
-                       const CRYPTO_EX_DATA *from);
+    const CRYPTO_EX_DATA *from);
 
 void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
 
 /* Allocate a single item in the CRYPTO_EX_DATA variable */
 int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
-                         int idx);
+    int idx);
 
 /*
  * Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular
@@ -258,12 +263,14 @@ int CRYPTO_alloc_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad,
 int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);
 void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /*
  * This function cleans up all "ex_data" state. It mustn't be called under
  * potential race-conditions.
  */
-# define CRYPTO_cleanup_all_ex_data() while(0) continue
+#define CRYPTO_cleanup_all_ex_data() \
+    while (0)                        \
+    continue
 
 /*
  * The old locking functions have been removed completely without compatibility
@@ -275,66 +282,66 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
  * On the other hand, the locking callbacks are no longer used.  Consequently,
  * the callback management functions can be safely replaced with no-op macros.
  */
-#  define CRYPTO_num_locks()            (1)
-#  define CRYPTO_set_locking_callback(func)
-#  define CRYPTO_get_locking_callback()         (NULL)
-#  define CRYPTO_set_add_lock_callback(func)
-#  define CRYPTO_get_add_lock_callback()        (NULL)
+#define CRYPTO_num_locks() (1)
+#define CRYPTO_set_locking_callback(func)
+#define CRYPTO_get_locking_callback() (NULL)
+#define CRYPTO_set_add_lock_callback(func)
+#define CRYPTO_get_add_lock_callback() (NULL)
 
 /*
  * These defines where used in combination with the old locking callbacks,
  * they are not called anymore, but old code that's not called might still
  * use them.
  */
-#  define CRYPTO_LOCK             1
-#  define CRYPTO_UNLOCK           2
-#  define CRYPTO_READ             4
-#  define CRYPTO_WRITE            8
+#define CRYPTO_LOCK 1
+#define CRYPTO_UNLOCK 2
+#define CRYPTO_READ 4
+#define CRYPTO_WRITE 8
 
 /* This structure is no longer used */
 typedef struct crypto_threadid_st {
     int dummy;
 } CRYPTO_THREADID;
 /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-#  define CRYPTO_THREADID_set_numeric(id, val)
-#  define CRYPTO_THREADID_set_pointer(id, ptr)
-#  define CRYPTO_THREADID_set_callback(threadid_func)   (0)
-#  define CRYPTO_THREADID_get_callback()                (NULL)
-#  define CRYPTO_THREADID_current(id)
-#  define CRYPTO_THREADID_cmp(a, b)                     (-1)
-#  define CRYPTO_THREADID_cpy(dest, src)
-#  define CRYPTO_THREADID_hash(id)                      (0UL)
+#define CRYPTO_THREADID_set_numeric(id, val)
+#define CRYPTO_THREADID_set_pointer(id, ptr)
+#define CRYPTO_THREADID_set_callback(threadid_func) (0)
+#define CRYPTO_THREADID_get_callback() (NULL)
+#define CRYPTO_THREADID_current(id)
+#define CRYPTO_THREADID_cmp(a, b) (-1)
+#define CRYPTO_THREADID_cpy(dest, src)
+#define CRYPTO_THREADID_hash(id) (0UL)
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_0_0
-#   define CRYPTO_set_id_callback(func)
-#   define CRYPTO_get_id_callback()                     (NULL)
-#   define CRYPTO_thread_id()                           (0UL)
-#  endif /* OPENSSL_NO_DEPRECATED_1_0_0 */
+#ifndef OPENSSL_NO_DEPRECATED_1_0_0
+#define CRYPTO_set_id_callback(func)
+#define CRYPTO_get_id_callback() (NULL)
+#define CRYPTO_thread_id() (0UL)
+#endif /* OPENSSL_NO_DEPRECATED_1_0_0 */
 
-#  define CRYPTO_set_dynlock_create_callback(dyn_create_function)
-#  define CRYPTO_set_dynlock_lock_callback(dyn_lock_function)
-#  define CRYPTO_set_dynlock_destroy_callback(dyn_destroy_function)
-#  define CRYPTO_get_dynlock_create_callback()          (NULL)
-#  define CRYPTO_get_dynlock_lock_callback()            (NULL)
-#  define CRYPTO_get_dynlock_destroy_callback()         (NULL)
-# endif /* OPENSSL_NO_DEPRECATED_1_1_0 */
+#define CRYPTO_set_dynlock_create_callback(dyn_create_function)
+#define CRYPTO_set_dynlock_lock_callback(dyn_lock_function)
+#define CRYPTO_set_dynlock_destroy_callback(dyn_destroy_function)
+#define CRYPTO_get_dynlock_create_callback() (NULL)
+#define CRYPTO_get_dynlock_lock_callback() (NULL)
+#define CRYPTO_get_dynlock_destroy_callback() (NULL)
+#endif /* OPENSSL_NO_DEPRECATED_1_1_0 */
 
 typedef void *(*CRYPTO_malloc_fn)(size_t num, const char *file, int line);
 typedef void *(*CRYPTO_realloc_fn)(void *addr, size_t num, const char *file,
-                                   int line);
+    int line);
 typedef void (*CRYPTO_free_fn)(void *addr, const char *file, int line);
 int CRYPTO_set_mem_functions(CRYPTO_malloc_fn malloc_fn,
-                             CRYPTO_realloc_fn realloc_fn,
-                             CRYPTO_free_fn free_fn);
+    CRYPTO_realloc_fn realloc_fn,
+    CRYPTO_free_fn free_fn);
 void CRYPTO_get_mem_functions(CRYPTO_malloc_fn *malloc_fn,
-                              CRYPTO_realloc_fn *realloc_fn,
-                              CRYPTO_free_fn *free_fn);
+    CRYPTO_realloc_fn *realloc_fn,
+    CRYPTO_free_fn *free_fn);
 
 OSSL_CRYPTO_ALLOC void *CRYPTO_malloc(size_t num, const char *file, int line);
 OSSL_CRYPTO_ALLOC void *CRYPTO_zalloc(size_t num, const char *file, int line);
 OSSL_CRYPTO_ALLOC void *CRYPTO_aligned_alloc(size_t num, size_t align,
-                                             void **freeptr, const char *file,
-                                             int line);
+    void **freeptr, const char *file,
+    int line);
 void *CRYPTO_memdup(const void *str, size_t siz, const char *file, int line);
 char *CRYPTO_strdup(const char *str, const char *file, int line);
 char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line);
@@ -342,7 +349,7 @@ void CRYPTO_free(void *ptr, const char *file, int line);
 void CRYPTO_clear_free(void *ptr, size_t num, const char *file, int line);
 void *CRYPTO_realloc(void *addr, size_t num, const char *file, int line);
 void *CRYPTO_clear_realloc(void *addr, size_t old_num, size_t num,
-                           const char *file, int line);
+    const char *file, int line);
 
 int CRYPTO_secure_malloc_init(size_t sz, size_t minsize);
 int CRYPTO_secure_malloc_done(void);
@@ -350,7 +357,7 @@ OSSL_CRYPTO_ALLOC void *CRYPTO_secure_malloc(size_t num, const char *file, int l
 OSSL_CRYPTO_ALLOC void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
 void CRYPTO_secure_free(void *ptr, const char *file, int line);
 void CRYPTO_secure_clear_free(void *ptr, size_t num,
-                              const char *file, int line);
+    const char *file, int line);
 int CRYPTO_secure_allocated(const void *ptr);
 int CRYPTO_secure_malloc_initialized(void);
 size_t CRYPTO_secure_actual_size(void *ptr);
@@ -358,77 +365,77 @@ size_t CRYPTO_secure_used(void);
 
 void OPENSSL_cleanse(void *ptr, size_t len);
 
-# ifndef OPENSSL_NO_CRYPTO_MDEBUG
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
 /*
  * The following can be used to detect memory leaks in the library. If
  * used, it turns on malloc checking
  */
-# define CRYPTO_MEM_CHECK_OFF     0x0   /* Control only */
-# define CRYPTO_MEM_CHECK_ON      0x1   /* Control and mode bit */
-# define CRYPTO_MEM_CHECK_ENABLE  0x2   /* Control and mode bit */
-# define CRYPTO_MEM_CHECK_DISABLE 0x3   /* Control only */
+#define CRYPTO_MEM_CHECK_OFF 0x0 /* Control only */
+#define CRYPTO_MEM_CHECK_ON 0x1 /* Control and mode bit */
+#define CRYPTO_MEM_CHECK_ENABLE 0x2 /* Control and mode bit */
+#define CRYPTO_MEM_CHECK_DISABLE 0x3 /* Control only */
 
 /* max allowed length for value of OPENSSL_MALLOC_FAILURES env var. */
-#  define CRYPTO_MEM_CHECK_MAX_FS 256
+#define CRYPTO_MEM_CHECK_MAX_FS 256
 
 void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount);
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#    define OPENSSL_mem_debug_push(info) \
-         CRYPTO_mem_debug_push(info, OPENSSL_FILE, OPENSSL_LINE)
-#    define OPENSSL_mem_debug_pop() \
-         CRYPTO_mem_debug_pop()
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define OPENSSL_mem_debug_push(info) \
+    CRYPTO_mem_debug_push(info, OPENSSL_FILE, OPENSSL_LINE)
+#define OPENSSL_mem_debug_pop() \
+    CRYPTO_mem_debug_pop()
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int CRYPTO_set_mem_debug(int flag);
 OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_ctrl(int mode);
 OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_debug_push(const char *info,
-                                                const char *file, int line);
+    const char *file, int line);
 OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_debug_pop(void);
 OSSL_DEPRECATEDIN_3_0 void CRYPTO_mem_debug_malloc(void *addr, size_t num,
-                                                   int flag,
-                                                   const char *file, int line);
+    int flag,
+    const char *file, int line);
 OSSL_DEPRECATEDIN_3_0 void CRYPTO_mem_debug_realloc(void *addr1, void *addr2,
-                                                    size_t num, int flag,
-                                                    const char *file, int line);
+    size_t num, int flag,
+    const char *file, int line);
 OSSL_DEPRECATEDIN_3_0 void CRYPTO_mem_debug_free(void *addr, int flag,
-                                                 const char *file, int line);
+    const char *file, int line);
 OSSL_DEPRECATEDIN_3_0
 int CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
-                        void *u);
-#  endif
-#  ifndef OPENSSL_NO_STDIO
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+    void *u);
+#endif
+#ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_leaks_fp(FILE *);
-#  endif
-#  endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int CRYPTO_mem_leaks(BIO *bio);
-# endif
-# endif /* OPENSSL_NO_CRYPTO_MDEBUG */
+#endif
+#endif /* OPENSSL_NO_CRYPTO_MDEBUG */
 
 /* die if we have to */
 ossl_noreturn void OPENSSL_die(const char *assertion, const char *file, int line);
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define OpenSSLDie(f,l,a) OPENSSL_die((a),(f),(l))
-# endif
-# define OPENSSL_assert(e) \
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define OpenSSLDie(f, l, a) OPENSSL_die((a), (f), (l))
+#endif
+#define OPENSSL_assert(e) \
     (void)((e) ? 0 : (OPENSSL_die("assertion failed: " #e, OPENSSL_FILE, OPENSSL_LINE), 1))
 
 int OPENSSL_isservice(void);
 
 void OPENSSL_init(void);
-# ifdef OPENSSL_SYS_UNIX
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifdef OPENSSL_SYS_UNIX
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_prepare(void);
 OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_parent(void);
 OSSL_DEPRECATEDIN_3_0 void OPENSSL_fork_child(void);
-#  endif
-# endif
+#endif
+#endif
 
 struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result);
 int OPENSSL_gmtime_adj(struct tm *tm, int offset_day, long offset_sec);
 int OPENSSL_gmtime_diff(int *pday, int *psec,
-                        const struct tm *from, const struct tm *to);
+    const struct tm *from, const struct tm *to);
 
 /*
  * CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal.
@@ -437,29 +444,29 @@ int OPENSSL_gmtime_diff(int *pday, int *psec,
  * into a defined order as the return value when a != b is undefined, other
  * than to be non-zero.
  */
-int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
+int CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len);
 
 /* Standard initialisation options */
-# define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS 0x00000001L
-# define OPENSSL_INIT_LOAD_CRYPTO_STRINGS    0x00000002L
-# define OPENSSL_INIT_ADD_ALL_CIPHERS        0x00000004L
-# define OPENSSL_INIT_ADD_ALL_DIGESTS        0x00000008L
-# define OPENSSL_INIT_NO_ADD_ALL_CIPHERS     0x00000010L
-# define OPENSSL_INIT_NO_ADD_ALL_DIGESTS     0x00000020L
-# define OPENSSL_INIT_LOAD_CONFIG            0x00000040L
-# define OPENSSL_INIT_NO_LOAD_CONFIG         0x00000080L
-# define OPENSSL_INIT_ASYNC                  0x00000100L
-# define OPENSSL_INIT_ENGINE_RDRAND          0x00000200L
-# define OPENSSL_INIT_ENGINE_DYNAMIC         0x00000400L
-# define OPENSSL_INIT_ENGINE_OPENSSL         0x00000800L
-# define OPENSSL_INIT_ENGINE_CRYPTODEV       0x00001000L
-# define OPENSSL_INIT_ENGINE_CAPI            0x00002000L
-# define OPENSSL_INIT_ENGINE_PADLOCK         0x00004000L
-# define OPENSSL_INIT_ENGINE_AFALG           0x00008000L
+#define OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS 0x00000001L
+#define OPENSSL_INIT_LOAD_CRYPTO_STRINGS 0x00000002L
+#define OPENSSL_INIT_ADD_ALL_CIPHERS 0x00000004L
+#define OPENSSL_INIT_ADD_ALL_DIGESTS 0x00000008L
+#define OPENSSL_INIT_NO_ADD_ALL_CIPHERS 0x00000010L
+#define OPENSSL_INIT_NO_ADD_ALL_DIGESTS 0x00000020L
+#define OPENSSL_INIT_LOAD_CONFIG 0x00000040L
+#define OPENSSL_INIT_NO_LOAD_CONFIG 0x00000080L
+#define OPENSSL_INIT_ASYNC 0x00000100L
+#define OPENSSL_INIT_ENGINE_RDRAND 0x00000200L
+#define OPENSSL_INIT_ENGINE_DYNAMIC 0x00000400L
+#define OPENSSL_INIT_ENGINE_OPENSSL 0x00000800L
+#define OPENSSL_INIT_ENGINE_CRYPTODEV 0x00001000L
+#define OPENSSL_INIT_ENGINE_CAPI 0x00002000L
+#define OPENSSL_INIT_ENGINE_PADLOCK 0x00004000L
+#define OPENSSL_INIT_ENGINE_AFALG 0x00008000L
 /* FREE:                                     0x00010000L */
-# define OPENSSL_INIT_ATFORK                 0x00020000L
+#define OPENSSL_INIT_ATFORK 0x00020000L
 /* OPENSSL_INIT_BASE_ONLY                    0x00040000L */
-# define OPENSSL_INIT_NO_ATEXIT              0x00080000L
+#define OPENSSL_INIT_NO_ATEXIT 0x00080000L
 /* OPENSSL_INIT flag range 0x03f00000 reserved for OPENSSL_init_ssl() */
 /* FREE: 0x04000000L */
 /* FREE: 0x08000000L */
@@ -470,10 +477,9 @@ int CRYPTO_memcmp(const void * in_a, const void * in_b, size_t len);
 /* Max OPENSSL_INIT flag value is 0x80000000 */
 
 /* openssl and dasync not counted as builtin */
-# define OPENSSL_INIT_ENGINE_ALL_BUILTIN \
+#define OPENSSL_INIT_ENGINE_ALL_BUILTIN                       \
     (OPENSSL_INIT_ENGINE_RDRAND | OPENSSL_INIT_ENGINE_DYNAMIC \
-    | OPENSSL_INIT_ENGINE_CRYPTODEV | OPENSSL_INIT_ENGINE_CAPI | \
-    OPENSSL_INIT_ENGINE_PADLOCK)
+        | OPENSSL_INIT_ENGINE_CRYPTODEV | OPENSSL_INIT_ENGINE_CAPI | OPENSSL_INIT_ENGINE_PADLOCK)
 
 /* Library initialisation functions */
 void OPENSSL_cleanup(void);
@@ -484,48 +490,48 @@ void OPENSSL_thread_stop_ex(OSSL_LIB_CTX *ctx);
 
 /* Low-level control of initialization */
 OPENSSL_INIT_SETTINGS *OPENSSL_INIT_new(void);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int OPENSSL_INIT_set_config_filename(OPENSSL_INIT_SETTINGS *settings,
-                                     const char *config_filename);
+    const char *config_filename);
 void OPENSSL_INIT_set_config_file_flags(OPENSSL_INIT_SETTINGS *settings,
-                                        unsigned long flags);
+    unsigned long flags);
 int OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS *settings,
-                                    const char *config_appname);
-# endif
+    const char *config_appname);
+#endif
 void OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS *settings);
 
-# if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
-#  if defined(_WIN32)
-#   if defined(BASETYPES) || defined(_WINDEF_H)
+#if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG)
+#if defined(_WIN32)
+#if defined(BASETYPES) || defined(_WINDEF_H)
 /* application has to include <windows.h> in order to use this */
 typedef DWORD CRYPTO_THREAD_LOCAL;
 typedef DWORD CRYPTO_THREAD_ID;
 
 typedef LONG CRYPTO_ONCE;
-#    define CRYPTO_ONCE_STATIC_INIT 0
-#   endif
-#  else
-#   if defined(__TANDEM) && defined(_SPT_MODEL_)
-#    define  SPT_THREAD_SIGNAL 1
-#    define  SPT_THREAD_AWARE 1
-#    include <spthread.h>
-#   else
-#    include <pthread.h>
-#   endif
+#define CRYPTO_ONCE_STATIC_INIT 0
+#endif
+#else
+#if defined(__TANDEM) && defined(_SPT_MODEL_)
+#define SPT_THREAD_SIGNAL 1
+#define SPT_THREAD_AWARE 1
+#include <spthread.h>
+#else
+#include <pthread.h>
+#endif
 typedef pthread_once_t CRYPTO_ONCE;
 typedef pthread_key_t CRYPTO_THREAD_LOCAL;
 typedef pthread_t CRYPTO_THREAD_ID;
 
-#   define CRYPTO_ONCE_STATIC_INIT PTHREAD_ONCE_INIT
-#  endif
-# endif
+#define CRYPTO_ONCE_STATIC_INIT PTHREAD_ONCE_INIT
+#endif
+#endif
 
-# if !defined(CRYPTO_ONCE_STATIC_INIT)
+#if !defined(CRYPTO_ONCE_STATIC_INIT)
 typedef unsigned int CRYPTO_ONCE;
 typedef unsigned int CRYPTO_THREAD_LOCAL;
 typedef unsigned int CRYPTO_THREAD_ID;
-#  define CRYPTO_ONCE_STATIC_INIT 0
-# endif
+#define CRYPTO_ONCE_STATIC_INIT 0
+#endif
 
 int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void));
 
@@ -539,9 +545,9 @@ int CRYPTO_THREAD_compare_id(CRYPTO_THREAD_ID a, CRYPTO_THREAD_ID b);
 
 OSSL_LIB_CTX *OSSL_LIB_CTX_new(void);
 OSSL_LIB_CTX *OSSL_LIB_CTX_new_from_dispatch(const OSSL_CORE_HANDLE *handle,
-                                             const OSSL_DISPATCH *in);
+    const OSSL_DISPATCH *in);
 OSSL_LIB_CTX *OSSL_LIB_CTX_new_child(const OSSL_CORE_HANDLE *handle,
-                                     const OSSL_DISPATCH *in);
+    const OSSL_DISPATCH *in);
 int OSSL_LIB_CTX_load_config(OSSL_LIB_CTX *ctx, const char *config_file);
 void OSSL_LIB_CTX_free(OSSL_LIB_CTX *);
 OSSL_LIB_CTX *OSSL_LIB_CTX_get0_global_default(void);
@@ -551,10 +557,9 @@ void OSSL_LIB_CTX_set_conf_diagnostics(OSSL_LIB_CTX *ctx, int value);
 
 void OSSL_sleep(uint64_t millis);
 
-
 void *OSSL_LIB_CTX_get_data(OSSL_LIB_CTX *ctx, int index);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index 7fa79cf38541..626e3e9be57b 100644
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -9,48 +9,46 @@
  */
 
 #ifndef OPENSSL_CRYPTOERR_H
-# define OPENSSL_CRYPTOERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_CRYPTOERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * CRYPTO reason codes.
  */
-# define CRYPTO_R_BAD_ALGORITHM_NAME                      117
-# define CRYPTO_R_CONFLICTING_NAMES                       118
-# define CRYPTO_R_HEX_STRING_TOO_SHORT                    121
-# define CRYPTO_R_ILLEGAL_HEX_DIGIT                       102
-# define CRYPTO_R_INSUFFICIENT_DATA_SPACE                 106
-# define CRYPTO_R_INSUFFICIENT_PARAM_SIZE                 107
-# define CRYPTO_R_INSUFFICIENT_SECURE_DATA_SPACE          108
-# define CRYPTO_R_INTEGER_OVERFLOW                        127
-# define CRYPTO_R_INVALID_NEGATIVE_VALUE                  122
-# define CRYPTO_R_INVALID_NULL_ARGUMENT                   109
-# define CRYPTO_R_INVALID_OSSL_PARAM_TYPE                 110
-# define CRYPTO_R_NO_PARAMS_TO_MERGE                      131
-# define CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL           128
-# define CRYPTO_R_ODD_NUMBER_OF_DIGITS                    103
-# define CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY     123
-# define CRYPTO_R_PARAM_NOT_INTEGER_TYPE                  124
-# define CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE              129
-# define CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED 125
-# define CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT 130
-# define CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION   126
-# define CRYPTO_R_PROVIDER_ALREADY_EXISTS                 104
-# define CRYPTO_R_PROVIDER_SECTION_ERROR                  105
-# define CRYPTO_R_RANDOM_SECTION_ERROR                    119
-# define CRYPTO_R_SECURE_MALLOC_FAILURE                   111
-# define CRYPTO_R_STRING_TOO_LONG                         112
-# define CRYPTO_R_TOO_MANY_BYTES                          113
-# define CRYPTO_R_TOO_MANY_NAMES                          132
-# define CRYPTO_R_TOO_MANY_RECORDS                        114
-# define CRYPTO_R_TOO_SMALL_BUFFER                        116
-# define CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION          120
-# define CRYPTO_R_ZERO_LENGTH_NUMBER                      115
+#define CRYPTO_R_BAD_ALGORITHM_NAME 117
+#define CRYPTO_R_CONFLICTING_NAMES 118
+#define CRYPTO_R_HEX_STRING_TOO_SHORT 121
+#define CRYPTO_R_ILLEGAL_HEX_DIGIT 102
+#define CRYPTO_R_INSUFFICIENT_DATA_SPACE 106
+#define CRYPTO_R_INSUFFICIENT_PARAM_SIZE 107
+#define CRYPTO_R_INSUFFICIENT_SECURE_DATA_SPACE 108
+#define CRYPTO_R_INTEGER_OVERFLOW 127
+#define CRYPTO_R_INVALID_NEGATIVE_VALUE 122
+#define CRYPTO_R_INVALID_NULL_ARGUMENT 109
+#define CRYPTO_R_INVALID_OSSL_PARAM_TYPE 110
+#define CRYPTO_R_NO_PARAMS_TO_MERGE 131
+#define CRYPTO_R_NO_SPACE_FOR_TERMINATING_NULL 128
+#define CRYPTO_R_ODD_NUMBER_OF_DIGITS 103
+#define CRYPTO_R_PARAM_CANNOT_BE_REPRESENTED_EXACTLY 123
+#define CRYPTO_R_PARAM_NOT_INTEGER_TYPE 124
+#define CRYPTO_R_PARAM_OF_INCOMPATIBLE_TYPE 129
+#define CRYPTO_R_PARAM_UNSIGNED_INTEGER_NEGATIVE_VALUE_UNSUPPORTED 125
+#define CRYPTO_R_PARAM_UNSUPPORTED_FLOATING_POINT_FORMAT 130
+#define CRYPTO_R_PARAM_VALUE_TOO_LARGE_FOR_DESTINATION 126
+#define CRYPTO_R_PROVIDER_ALREADY_EXISTS 104
+#define CRYPTO_R_PROVIDER_SECTION_ERROR 105
+#define CRYPTO_R_RANDOM_SECTION_ERROR 119
+#define CRYPTO_R_SECURE_MALLOC_FAILURE 111
+#define CRYPTO_R_STRING_TOO_LONG 112
+#define CRYPTO_R_TOO_MANY_BYTES 113
+#define CRYPTO_R_TOO_MANY_NAMES 132
+#define CRYPTO_R_TOO_MANY_RECORDS 114
+#define CRYPTO_R_TOO_SMALL_BUFFER 116
+#define CRYPTO_R_UNKNOWN_NAME_IN_RANDOM_SECTION 120
+#define CRYPTO_R_ZERO_LENGTH_NUMBER 115
 
 #endif
diff --git a/include/openssl/cryptoerr_legacy.h b/include/openssl/cryptoerr_legacy.h
index ccab33a5d4f0..b1388a5b57b3 100644
--- a/include/openssl/cryptoerr_legacy.h
+++ b/include/openssl/cryptoerr_legacy.h
@@ -15,61 +15,61 @@
  */
 
 #ifndef OPENSSL_CRYPTOERR_LEGACY_H
-# define OPENSSL_CRYPTOERR_LEGACY_H
-# pragma once
+#define OPENSSL_CRYPTOERR_LEGACY_H
+#pragma once
 
-# include <openssl/macros.h>
-# include <openssl/symhacks.h>
+#include <openssl/macros.h>
+#include <openssl/symhacks.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ERR_load_ASN1_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_ASYNC_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_BIO_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_BN_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_BUF_strings(void);
-#  ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
 OSSL_DEPRECATEDIN_3_0 int ERR_load_CMS_strings(void);
-#  endif
-#  ifndef OPENSSL_NO_COMP
+#endif
+#ifndef OPENSSL_NO_COMP
 OSSL_DEPRECATEDIN_3_0 int ERR_load_COMP_strings(void);
-#  endif
+#endif
 OSSL_DEPRECATEDIN_3_0 int ERR_load_CONF_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_CRYPTO_strings(void);
-#  ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 OSSL_DEPRECATEDIN_3_0 int ERR_load_CT_strings(void);
-#  endif
-#  ifndef OPENSSL_NO_DH
+#endif
+#ifndef OPENSSL_NO_DH
 OSSL_DEPRECATEDIN_3_0 int ERR_load_DH_strings(void);
-#  endif
-#  ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DSA
 OSSL_DEPRECATEDIN_3_0 int ERR_load_DSA_strings(void);
-#  endif
-#  ifndef OPENSSL_NO_EC
+#endif
+#ifndef OPENSSL_NO_EC
 OSSL_DEPRECATEDIN_3_0 int ERR_load_EC_strings(void);
-#  endif
-#  ifndef OPENSSL_NO_ENGINE
+#endif
+#ifndef OPENSSL_NO_ENGINE
 OSSL_DEPRECATEDIN_3_0 int ERR_load_ENGINE_strings(void);
-#  endif
+#endif
 OSSL_DEPRECATEDIN_3_0 int ERR_load_ERR_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_EVP_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_KDF_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_OBJ_strings(void);
-#  ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 OSSL_DEPRECATEDIN_3_0 int ERR_load_OCSP_strings(void);
-#  endif
+#endif
 OSSL_DEPRECATEDIN_3_0 int ERR_load_PEM_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_PKCS12_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_PKCS7_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_RAND_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_RSA_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_OSSL_STORE_strings(void);
-#  ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
 OSSL_DEPRECATEDIN_3_0 int ERR_load_TS_strings(void);
-#  endif
+#endif
 OSSL_DEPRECATEDIN_3_0 int ERR_load_UI_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_X509_strings(void);
 OSSL_DEPRECATEDIN_3_0 int ERR_load_X509V3_strings(void);
@@ -79,1388 +79,1388 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_X509V3_strings(void);
 /*
  * ASN1 function codes.
  */
-#  define ASN1_F_A2D_ASN1_OBJECT                           0
-#  define ASN1_F_A2I_ASN1_INTEGER                          0
-#  define ASN1_F_A2I_ASN1_STRING                           0
-#  define ASN1_F_APPEND_EXP                                0
-#  define ASN1_F_ASN1_BIO_INIT                             0
-#  define ASN1_F_ASN1_BIT_STRING_SET_BIT                   0
-#  define ASN1_F_ASN1_CB                                   0
-#  define ASN1_F_ASN1_CHECK_TLEN                           0
-#  define ASN1_F_ASN1_COLLECT                              0
-#  define ASN1_F_ASN1_D2I_EX_PRIMITIVE                     0
-#  define ASN1_F_ASN1_D2I_FP                               0
-#  define ASN1_F_ASN1_D2I_READ_BIO                         0
-#  define ASN1_F_ASN1_DIGEST                               0
-#  define ASN1_F_ASN1_DO_ADB                               0
-#  define ASN1_F_ASN1_DO_LOCK                              0
-#  define ASN1_F_ASN1_DUP                                  0
-#  define ASN1_F_ASN1_ENC_SAVE                             0
-#  define ASN1_F_ASN1_EX_C2I                               0
-#  define ASN1_F_ASN1_FIND_END                             0
-#  define ASN1_F_ASN1_GENERALIZEDTIME_ADJ                  0
-#  define ASN1_F_ASN1_GENERATE_V3                          0
-#  define ASN1_F_ASN1_GET_INT64                            0
-#  define ASN1_F_ASN1_GET_OBJECT                           0
-#  define ASN1_F_ASN1_GET_UINT64                           0
-#  define ASN1_F_ASN1_I2D_BIO                              0
-#  define ASN1_F_ASN1_I2D_FP                               0
-#  define ASN1_F_ASN1_ITEM_D2I_FP                          0
-#  define ASN1_F_ASN1_ITEM_DUP                             0
-#  define ASN1_F_ASN1_ITEM_EMBED_D2I                       0
-#  define ASN1_F_ASN1_ITEM_EMBED_NEW                       0
-#  define ASN1_F_ASN1_ITEM_FLAGS_I2D                       0
-#  define ASN1_F_ASN1_ITEM_I2D_BIO                         0
-#  define ASN1_F_ASN1_ITEM_I2D_FP                          0
-#  define ASN1_F_ASN1_ITEM_PACK                            0
-#  define ASN1_F_ASN1_ITEM_SIGN                            0
-#  define ASN1_F_ASN1_ITEM_SIGN_CTX                        0
-#  define ASN1_F_ASN1_ITEM_UNPACK                          0
-#  define ASN1_F_ASN1_ITEM_VERIFY                          0
-#  define ASN1_F_ASN1_MBSTRING_NCOPY                       0
-#  define ASN1_F_ASN1_OBJECT_NEW                           0
-#  define ASN1_F_ASN1_OUTPUT_DATA                          0
-#  define ASN1_F_ASN1_PCTX_NEW                             0
-#  define ASN1_F_ASN1_PRIMITIVE_NEW                        0
-#  define ASN1_F_ASN1_SCTX_NEW                             0
-#  define ASN1_F_ASN1_SIGN                                 0
-#  define ASN1_F_ASN1_STR2TYPE                             0
-#  define ASN1_F_ASN1_STRING_GET_INT64                     0
-#  define ASN1_F_ASN1_STRING_GET_UINT64                    0
-#  define ASN1_F_ASN1_STRING_SET                           0
-#  define ASN1_F_ASN1_STRING_TABLE_ADD                     0
-#  define ASN1_F_ASN1_STRING_TO_BN                         0
-#  define ASN1_F_ASN1_STRING_TYPE_NEW                      0
-#  define ASN1_F_ASN1_TEMPLATE_EX_D2I                      0
-#  define ASN1_F_ASN1_TEMPLATE_NEW                         0
-#  define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                   0
-#  define ASN1_F_ASN1_TIME_ADJ                             0
-#  define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             0
-#  define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 0
-#  define ASN1_F_ASN1_UTCTIME_ADJ                          0
-#  define ASN1_F_ASN1_VERIFY                               0
-#  define ASN1_F_B64_READ_ASN1                             0
-#  define ASN1_F_B64_WRITE_ASN1                            0
-#  define ASN1_F_BIO_NEW_NDEF                              0
-#  define ASN1_F_BITSTR_CB                                 0
-#  define ASN1_F_BN_TO_ASN1_STRING                         0
-#  define ASN1_F_C2I_ASN1_BIT_STRING                       0
-#  define ASN1_F_C2I_ASN1_INTEGER                          0
-#  define ASN1_F_C2I_ASN1_OBJECT                           0
-#  define ASN1_F_C2I_IBUF                                  0
-#  define ASN1_F_C2I_UINT64_INT                            0
-#  define ASN1_F_COLLECT_DATA                              0
-#  define ASN1_F_D2I_ASN1_OBJECT                           0
-#  define ASN1_F_D2I_ASN1_UINTEGER                         0
-#  define ASN1_F_D2I_AUTOPRIVATEKEY                        0
-#  define ASN1_F_D2I_PRIVATEKEY                            0
-#  define ASN1_F_D2I_PUBLICKEY                             0
-#  define ASN1_F_DO_BUF                                    0
-#  define ASN1_F_DO_CREATE                                 0
-#  define ASN1_F_DO_DUMP                                   0
-#  define ASN1_F_DO_TCREATE                                0
-#  define ASN1_F_I2A_ASN1_OBJECT                           0
-#  define ASN1_F_I2D_ASN1_BIO_STREAM                       0
-#  define ASN1_F_I2D_ASN1_OBJECT                           0
-#  define ASN1_F_I2D_DSA_PUBKEY                            0
-#  define ASN1_F_I2D_EC_PUBKEY                             0
-#  define ASN1_F_I2D_PRIVATEKEY                            0
-#  define ASN1_F_I2D_PUBLICKEY                             0
-#  define ASN1_F_I2D_RSA_PUBKEY                            0
-#  define ASN1_F_LONG_C2I                                  0
-#  define ASN1_F_NDEF_PREFIX                               0
-#  define ASN1_F_NDEF_SUFFIX                               0
-#  define ASN1_F_OID_MODULE_INIT                           0
-#  define ASN1_F_PARSE_TAGGING                             0
-#  define ASN1_F_PKCS5_PBE2_SET_IV                         0
-#  define ASN1_F_PKCS5_PBE2_SET_SCRYPT                     0
-#  define ASN1_F_PKCS5_PBE_SET                             0
-#  define ASN1_F_PKCS5_PBE_SET0_ALGOR                      0
-#  define ASN1_F_PKCS5_PBKDF2_SET                          0
-#  define ASN1_F_PKCS5_SCRYPT_SET                          0
-#  define ASN1_F_SMIME_READ_ASN1                           0
-#  define ASN1_F_SMIME_TEXT                                0
-#  define ASN1_F_STABLE_GET                                0
-#  define ASN1_F_STBL_MODULE_INIT                          0
-#  define ASN1_F_UINT32_C2I                                0
-#  define ASN1_F_UINT32_NEW                                0
-#  define ASN1_F_UINT64_C2I                                0
-#  define ASN1_F_UINT64_NEW                                0
-#  define ASN1_F_X509_CRL_ADD0_REVOKED                     0
-#  define ASN1_F_X509_INFO_NEW                             0
-#  define ASN1_F_X509_NAME_ENCODE                          0
-#  define ASN1_F_X509_NAME_EX_D2I                          0
-#  define ASN1_F_X509_NAME_EX_NEW                          0
-#  define ASN1_F_X509_PKEY_NEW                             0
+#define ASN1_F_A2D_ASN1_OBJECT 0
+#define ASN1_F_A2I_ASN1_INTEGER 0
+#define ASN1_F_A2I_ASN1_STRING 0
+#define ASN1_F_APPEND_EXP 0
+#define ASN1_F_ASN1_BIO_INIT 0
+#define ASN1_F_ASN1_BIT_STRING_SET_BIT 0
+#define ASN1_F_ASN1_CB 0
+#define ASN1_F_ASN1_CHECK_TLEN 0
+#define ASN1_F_ASN1_COLLECT 0
+#define ASN1_F_ASN1_D2I_EX_PRIMITIVE 0
+#define ASN1_F_ASN1_D2I_FP 0
+#define ASN1_F_ASN1_D2I_READ_BIO 0
+#define ASN1_F_ASN1_DIGEST 0
+#define ASN1_F_ASN1_DO_ADB 0
+#define ASN1_F_ASN1_DO_LOCK 0
+#define ASN1_F_ASN1_DUP 0
+#define ASN1_F_ASN1_ENC_SAVE 0
+#define ASN1_F_ASN1_EX_C2I 0
+#define ASN1_F_ASN1_FIND_END 0
+#define ASN1_F_ASN1_GENERALIZEDTIME_ADJ 0
+#define ASN1_F_ASN1_GENERATE_V3 0
+#define ASN1_F_ASN1_GET_INT64 0
+#define ASN1_F_ASN1_GET_OBJECT 0
+#define ASN1_F_ASN1_GET_UINT64 0
+#define ASN1_F_ASN1_I2D_BIO 0
+#define ASN1_F_ASN1_I2D_FP 0
+#define ASN1_F_ASN1_ITEM_D2I_FP 0
+#define ASN1_F_ASN1_ITEM_DUP 0
+#define ASN1_F_ASN1_ITEM_EMBED_D2I 0
+#define ASN1_F_ASN1_ITEM_EMBED_NEW 0
+#define ASN1_F_ASN1_ITEM_FLAGS_I2D 0
+#define ASN1_F_ASN1_ITEM_I2D_BIO 0
+#define ASN1_F_ASN1_ITEM_I2D_FP 0
+#define ASN1_F_ASN1_ITEM_PACK 0
+#define ASN1_F_ASN1_ITEM_SIGN 0
+#define ASN1_F_ASN1_ITEM_SIGN_CTX 0
+#define ASN1_F_ASN1_ITEM_UNPACK 0
+#define ASN1_F_ASN1_ITEM_VERIFY 0
+#define ASN1_F_ASN1_MBSTRING_NCOPY 0
+#define ASN1_F_ASN1_OBJECT_NEW 0
+#define ASN1_F_ASN1_OUTPUT_DATA 0
+#define ASN1_F_ASN1_PCTX_NEW 0
+#define ASN1_F_ASN1_PRIMITIVE_NEW 0
+#define ASN1_F_ASN1_SCTX_NEW 0
+#define ASN1_F_ASN1_SIGN 0
+#define ASN1_F_ASN1_STR2TYPE 0
+#define ASN1_F_ASN1_STRING_GET_INT64 0
+#define ASN1_F_ASN1_STRING_GET_UINT64 0
+#define ASN1_F_ASN1_STRING_SET 0
+#define ASN1_F_ASN1_STRING_TABLE_ADD 0
+#define ASN1_F_ASN1_STRING_TO_BN 0
+#define ASN1_F_ASN1_STRING_TYPE_NEW 0
+#define ASN1_F_ASN1_TEMPLATE_EX_D2I 0
+#define ASN1_F_ASN1_TEMPLATE_NEW 0
+#define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I 0
+#define ASN1_F_ASN1_TIME_ADJ 0
+#define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING 0
+#define ASN1_F_ASN1_TYPE_GET_OCTETSTRING 0
+#define ASN1_F_ASN1_UTCTIME_ADJ 0
+#define ASN1_F_ASN1_VERIFY 0
+#define ASN1_F_B64_READ_ASN1 0
+#define ASN1_F_B64_WRITE_ASN1 0
+#define ASN1_F_BIO_NEW_NDEF 0
+#define ASN1_F_BITSTR_CB 0
+#define ASN1_F_BN_TO_ASN1_STRING 0
+#define ASN1_F_C2I_ASN1_BIT_STRING 0
+#define ASN1_F_C2I_ASN1_INTEGER 0
+#define ASN1_F_C2I_ASN1_OBJECT 0
+#define ASN1_F_C2I_IBUF 0
+#define ASN1_F_C2I_UINT64_INT 0
+#define ASN1_F_COLLECT_DATA 0
+#define ASN1_F_D2I_ASN1_OBJECT 0
+#define ASN1_F_D2I_ASN1_UINTEGER 0
+#define ASN1_F_D2I_AUTOPRIVATEKEY 0
+#define ASN1_F_D2I_PRIVATEKEY 0
+#define ASN1_F_D2I_PUBLICKEY 0
+#define ASN1_F_DO_BUF 0
+#define ASN1_F_DO_CREATE 0
+#define ASN1_F_DO_DUMP 0
+#define ASN1_F_DO_TCREATE 0
+#define ASN1_F_I2A_ASN1_OBJECT 0
+#define ASN1_F_I2D_ASN1_BIO_STREAM 0
+#define ASN1_F_I2D_ASN1_OBJECT 0
+#define ASN1_F_I2D_DSA_PUBKEY 0
+#define ASN1_F_I2D_EC_PUBKEY 0
+#define ASN1_F_I2D_PRIVATEKEY 0
+#define ASN1_F_I2D_PUBLICKEY 0
+#define ASN1_F_I2D_RSA_PUBKEY 0
+#define ASN1_F_LONG_C2I 0
+#define ASN1_F_NDEF_PREFIX 0
+#define ASN1_F_NDEF_SUFFIX 0
+#define ASN1_F_OID_MODULE_INIT 0
+#define ASN1_F_PARSE_TAGGING 0
+#define ASN1_F_PKCS5_PBE2_SET_IV 0
+#define ASN1_F_PKCS5_PBE2_SET_SCRYPT 0
+#define ASN1_F_PKCS5_PBE_SET 0
+#define ASN1_F_PKCS5_PBE_SET0_ALGOR 0
+#define ASN1_F_PKCS5_PBKDF2_SET 0
+#define ASN1_F_PKCS5_SCRYPT_SET 0
+#define ASN1_F_SMIME_READ_ASN1 0
+#define ASN1_F_SMIME_TEXT 0
+#define ASN1_F_STABLE_GET 0
+#define ASN1_F_STBL_MODULE_INIT 0
+#define ASN1_F_UINT32_C2I 0
+#define ASN1_F_UINT32_NEW 0
+#define ASN1_F_UINT64_C2I 0
+#define ASN1_F_UINT64_NEW 0
+#define ASN1_F_X509_CRL_ADD0_REVOKED 0
+#define ASN1_F_X509_INFO_NEW 0
+#define ASN1_F_X509_NAME_ENCODE 0
+#define ASN1_F_X509_NAME_EX_D2I 0
+#define ASN1_F_X509_NAME_EX_NEW 0
+#define ASN1_F_X509_PKEY_NEW 0
 
 /*
  * ASYNC function codes.
  */
-#  define ASYNC_F_ASYNC_CTX_NEW                            0
-#  define ASYNC_F_ASYNC_INIT_THREAD                        0
-#  define ASYNC_F_ASYNC_JOB_NEW                            0
-#  define ASYNC_F_ASYNC_PAUSE_JOB                          0
-#  define ASYNC_F_ASYNC_START_FUNC                         0
-#  define ASYNC_F_ASYNC_START_JOB                          0
-#  define ASYNC_F_ASYNC_WAIT_CTX_SET_WAIT_FD               0
+#define ASYNC_F_ASYNC_CTX_NEW 0
+#define ASYNC_F_ASYNC_INIT_THREAD 0
+#define ASYNC_F_ASYNC_JOB_NEW 0
+#define ASYNC_F_ASYNC_PAUSE_JOB 0
+#define ASYNC_F_ASYNC_START_FUNC 0
+#define ASYNC_F_ASYNC_START_JOB 0
+#define ASYNC_F_ASYNC_WAIT_CTX_SET_WAIT_FD 0
 
 /*
  * BIO function codes.
  */
-#  define BIO_F_ACPT_STATE                                 0
-#  define BIO_F_ADDRINFO_WRAP                              0
-#  define BIO_F_ADDR_STRINGS                               0
-#  define BIO_F_BIO_ACCEPT                                 0
-#  define BIO_F_BIO_ACCEPT_EX                              0
-#  define BIO_F_BIO_ACCEPT_NEW                             0
-#  define BIO_F_BIO_ADDR_NEW                               0
-#  define BIO_F_BIO_BIND                                   0
-#  define BIO_F_BIO_CALLBACK_CTRL                          0
-#  define BIO_F_BIO_CONNECT                                0
-#  define BIO_F_BIO_CONNECT_NEW                            0
-#  define BIO_F_BIO_CTRL                                   0
-#  define BIO_F_BIO_GETS                                   0
-#  define BIO_F_BIO_GET_HOST_IP                            0
-#  define BIO_F_BIO_GET_NEW_INDEX                          0
-#  define BIO_F_BIO_GET_PORT                               0
-#  define BIO_F_BIO_LISTEN                                 0
-#  define BIO_F_BIO_LOOKUP                                 0
-#  define BIO_F_BIO_LOOKUP_EX                              0
-#  define BIO_F_BIO_MAKE_PAIR                              0
-#  define BIO_F_BIO_METH_NEW                               0
-#  define BIO_F_BIO_NEW                                    0
-#  define BIO_F_BIO_NEW_DGRAM_SCTP                         0
-#  define BIO_F_BIO_NEW_FILE                               0
-#  define BIO_F_BIO_NEW_MEM_BUF                            0
-#  define BIO_F_BIO_NREAD                                  0
-#  define BIO_F_BIO_NREAD0                                 0
-#  define BIO_F_BIO_NWRITE                                 0
-#  define BIO_F_BIO_NWRITE0                                0
-#  define BIO_F_BIO_PARSE_HOSTSERV                         0
-#  define BIO_F_BIO_PUTS                                   0
-#  define BIO_F_BIO_READ                                   0
-#  define BIO_F_BIO_READ_EX                                0
-#  define BIO_F_BIO_READ_INTERN                            0
-#  define BIO_F_BIO_SOCKET                                 0
-#  define BIO_F_BIO_SOCKET_NBIO                            0
-#  define BIO_F_BIO_SOCK_INFO                              0
-#  define BIO_F_BIO_SOCK_INIT                              0
-#  define BIO_F_BIO_WRITE                                  0
-#  define BIO_F_BIO_WRITE_EX                               0
-#  define BIO_F_BIO_WRITE_INTERN                           0
-#  define BIO_F_BUFFER_CTRL                                0
-#  define BIO_F_CONN_CTRL                                  0
-#  define BIO_F_CONN_STATE                                 0
-#  define BIO_F_DGRAM_SCTP_NEW                             0
-#  define BIO_F_DGRAM_SCTP_READ                            0
-#  define BIO_F_DGRAM_SCTP_WRITE                           0
-#  define BIO_F_DOAPR_OUTCH                                0
-#  define BIO_F_FILE_CTRL                                  0
-#  define BIO_F_FILE_READ                                  0
-#  define BIO_F_LINEBUFFER_CTRL                            0
-#  define BIO_F_LINEBUFFER_NEW                             0
-#  define BIO_F_MEM_WRITE                                  0
-#  define BIO_F_NBIOF_NEW                                  0
-#  define BIO_F_SLG_WRITE                                  0
-#  define BIO_F_SSL_NEW                                    0
+#define BIO_F_ACPT_STATE 0
+#define BIO_F_ADDRINFO_WRAP 0
+#define BIO_F_ADDR_STRINGS 0
+#define BIO_F_BIO_ACCEPT 0
+#define BIO_F_BIO_ACCEPT_EX 0
+#define BIO_F_BIO_ACCEPT_NEW 0
+#define BIO_F_BIO_ADDR_NEW 0
+#define BIO_F_BIO_BIND 0
+#define BIO_F_BIO_CALLBACK_CTRL 0
+#define BIO_F_BIO_CONNECT 0
+#define BIO_F_BIO_CONNECT_NEW 0
+#define BIO_F_BIO_CTRL 0
+#define BIO_F_BIO_GETS 0
+#define BIO_F_BIO_GET_HOST_IP 0
+#define BIO_F_BIO_GET_NEW_INDEX 0
+#define BIO_F_BIO_GET_PORT 0
+#define BIO_F_BIO_LISTEN 0
+#define BIO_F_BIO_LOOKUP 0
+#define BIO_F_BIO_LOOKUP_EX 0
+#define BIO_F_BIO_MAKE_PAIR 0
+#define BIO_F_BIO_METH_NEW 0
+#define BIO_F_BIO_NEW 0
+#define BIO_F_BIO_NEW_DGRAM_SCTP 0
+#define BIO_F_BIO_NEW_FILE 0
+#define BIO_F_BIO_NEW_MEM_BUF 0
+#define BIO_F_BIO_NREAD 0
+#define BIO_F_BIO_NREAD0 0
+#define BIO_F_BIO_NWRITE 0
+#define BIO_F_BIO_NWRITE0 0
+#define BIO_F_BIO_PARSE_HOSTSERV 0
+#define BIO_F_BIO_PUTS 0
+#define BIO_F_BIO_READ 0
+#define BIO_F_BIO_READ_EX 0
+#define BIO_F_BIO_READ_INTERN 0
+#define BIO_F_BIO_SOCKET 0
+#define BIO_F_BIO_SOCKET_NBIO 0
+#define BIO_F_BIO_SOCK_INFO 0
+#define BIO_F_BIO_SOCK_INIT 0
+#define BIO_F_BIO_WRITE 0
+#define BIO_F_BIO_WRITE_EX 0
+#define BIO_F_BIO_WRITE_INTERN 0
+#define BIO_F_BUFFER_CTRL 0
+#define BIO_F_CONN_CTRL 0
+#define BIO_F_CONN_STATE 0
+#define BIO_F_DGRAM_SCTP_NEW 0
+#define BIO_F_DGRAM_SCTP_READ 0
+#define BIO_F_DGRAM_SCTP_WRITE 0
+#define BIO_F_DOAPR_OUTCH 0
+#define BIO_F_FILE_CTRL 0
+#define BIO_F_FILE_READ 0
+#define BIO_F_LINEBUFFER_CTRL 0
+#define BIO_F_LINEBUFFER_NEW 0
+#define BIO_F_MEM_WRITE 0
+#define BIO_F_NBIOF_NEW 0
+#define BIO_F_SLG_WRITE 0
+#define BIO_F_SSL_NEW 0
 
 /*
  * BN function codes.
  */
-#  define BN_F_BNRAND                                      0
-#  define BN_F_BNRAND_RANGE                                0
-#  define BN_F_BN_BLINDING_CONVERT_EX                      0
-#  define BN_F_BN_BLINDING_CREATE_PARAM                    0
-#  define BN_F_BN_BLINDING_INVERT_EX                       0
-#  define BN_F_BN_BLINDING_NEW                             0
-#  define BN_F_BN_BLINDING_UPDATE                          0
-#  define BN_F_BN_BN2DEC                                   0
-#  define BN_F_BN_BN2HEX                                   0
-#  define BN_F_BN_COMPUTE_WNAF                             0
-#  define BN_F_BN_CTX_GET                                  0
-#  define BN_F_BN_CTX_NEW                                  0
-#  define BN_F_BN_CTX_START                                0
-#  define BN_F_BN_DIV                                      0
-#  define BN_F_BN_DIV_RECP                                 0
-#  define BN_F_BN_EXP                                      0
-#  define BN_F_BN_EXPAND_INTERNAL                          0
-#  define BN_F_BN_GENCB_NEW                                0
-#  define BN_F_BN_GENERATE_DSA_NONCE                       0
-#  define BN_F_BN_GENERATE_PRIME_EX                        0
-#  define BN_F_BN_GF2M_MOD                                 0
-#  define BN_F_BN_GF2M_MOD_EXP                             0
-#  define BN_F_BN_GF2M_MOD_MUL                             0
-#  define BN_F_BN_GF2M_MOD_SOLVE_QUAD                      0
-#  define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR                  0
-#  define BN_F_BN_GF2M_MOD_SQR                             0
-#  define BN_F_BN_GF2M_MOD_SQRT                            0
-#  define BN_F_BN_LSHIFT                                   0
-#  define BN_F_BN_MOD_EXP2_MONT                            0
-#  define BN_F_BN_MOD_EXP_MONT                             0
-#  define BN_F_BN_MOD_EXP_MONT_CONSTTIME                   0
-#  define BN_F_BN_MOD_EXP_MONT_WORD                        0
-#  define BN_F_BN_MOD_EXP_RECP                             0
-#  define BN_F_BN_MOD_EXP_SIMPLE                           0
-#  define BN_F_BN_MOD_INVERSE                              0
-#  define BN_F_BN_MOD_INVERSE_NO_BRANCH                    0
-#  define BN_F_BN_MOD_LSHIFT_QUICK                         0
-#  define BN_F_BN_MOD_SQRT                                 0
-#  define BN_F_BN_MONT_CTX_NEW                             0
-#  define BN_F_BN_MPI2BN                                   0
-#  define BN_F_BN_NEW                                      0
-#  define BN_F_BN_POOL_GET                                 0
-#  define BN_F_BN_RAND                                     0
-#  define BN_F_BN_RAND_RANGE                               0
-#  define BN_F_BN_RECP_CTX_NEW                             0
-#  define BN_F_BN_RSHIFT                                   0
-#  define BN_F_BN_SET_WORDS                                0
-#  define BN_F_BN_STACK_PUSH                               0
-#  define BN_F_BN_USUB                                     0
+#define BN_F_BNRAND 0
+#define BN_F_BNRAND_RANGE 0
+#define BN_F_BN_BLINDING_CONVERT_EX 0
+#define BN_F_BN_BLINDING_CREATE_PARAM 0
+#define BN_F_BN_BLINDING_INVERT_EX 0
+#define BN_F_BN_BLINDING_NEW 0
+#define BN_F_BN_BLINDING_UPDATE 0
+#define BN_F_BN_BN2DEC 0
+#define BN_F_BN_BN2HEX 0
+#define BN_F_BN_COMPUTE_WNAF 0
+#define BN_F_BN_CTX_GET 0
+#define BN_F_BN_CTX_NEW 0
+#define BN_F_BN_CTX_START 0
+#define BN_F_BN_DIV 0
+#define BN_F_BN_DIV_RECP 0
+#define BN_F_BN_EXP 0
+#define BN_F_BN_EXPAND_INTERNAL 0
+#define BN_F_BN_GENCB_NEW 0
+#define BN_F_BN_GENERATE_DSA_NONCE 0
+#define BN_F_BN_GENERATE_PRIME_EX 0
+#define BN_F_BN_GF2M_MOD 0
+#define BN_F_BN_GF2M_MOD_EXP 0
+#define BN_F_BN_GF2M_MOD_MUL 0
+#define BN_F_BN_GF2M_MOD_SOLVE_QUAD 0
+#define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR 0
+#define BN_F_BN_GF2M_MOD_SQR 0
+#define BN_F_BN_GF2M_MOD_SQRT 0
+#define BN_F_BN_LSHIFT 0
+#define BN_F_BN_MOD_EXP2_MONT 0
+#define BN_F_BN_MOD_EXP_MONT 0
+#define BN_F_BN_MOD_EXP_MONT_CONSTTIME 0
+#define BN_F_BN_MOD_EXP_MONT_WORD 0
+#define BN_F_BN_MOD_EXP_RECP 0
+#define BN_F_BN_MOD_EXP_SIMPLE 0
+#define BN_F_BN_MOD_INVERSE 0
+#define BN_F_BN_MOD_INVERSE_NO_BRANCH 0
+#define BN_F_BN_MOD_LSHIFT_QUICK 0
+#define BN_F_BN_MOD_SQRT 0
+#define BN_F_BN_MONT_CTX_NEW 0
+#define BN_F_BN_MPI2BN 0
+#define BN_F_BN_NEW 0
+#define BN_F_BN_POOL_GET 0
+#define BN_F_BN_RAND 0
+#define BN_F_BN_RAND_RANGE 0
+#define BN_F_BN_RECP_CTX_NEW 0
+#define BN_F_BN_RSHIFT 0
+#define BN_F_BN_SET_WORDS 0
+#define BN_F_BN_STACK_PUSH 0
+#define BN_F_BN_USUB 0
 
 /*
  * BUF function codes.
  */
-#  define BUF_F_BUF_MEM_GROW                               0
-#  define BUF_F_BUF_MEM_GROW_CLEAN                         0
-#  define BUF_F_BUF_MEM_NEW                                0
+#define BUF_F_BUF_MEM_GROW 0
+#define BUF_F_BUF_MEM_GROW_CLEAN 0
+#define BUF_F_BUF_MEM_NEW 0
 
-#  ifndef OPENSSL_NO_CMS
+#ifndef OPENSSL_NO_CMS
 /*
  * CMS function codes.
  */
-#   define CMS_F_CHECK_CONTENT                              0
-#   define CMS_F_CMS_ADD0_CERT                              0
-#   define CMS_F_CMS_ADD0_RECIPIENT_KEY                     0
-#   define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD                0
-#   define CMS_F_CMS_ADD1_RECEIPTREQUEST                    0
-#   define CMS_F_CMS_ADD1_RECIPIENT_CERT                    0
-#   define CMS_F_CMS_ADD1_SIGNER                            0
-#   define CMS_F_CMS_ADD1_SIGNINGTIME                       0
-#   define CMS_F_CMS_COMPRESS                               0
-#   define CMS_F_CMS_COMPRESSEDDATA_CREATE                  0
-#   define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO                0
-#   define CMS_F_CMS_COPY_CONTENT                           0
-#   define CMS_F_CMS_COPY_MESSAGEDIGEST                     0
-#   define CMS_F_CMS_DATA                                   0
-#   define CMS_F_CMS_DATAFINAL                              0
-#   define CMS_F_CMS_DATAINIT                               0
-#   define CMS_F_CMS_DECRYPT                                0
-#   define CMS_F_CMS_DECRYPT_SET1_KEY                       0
-#   define CMS_F_CMS_DECRYPT_SET1_PASSWORD                  0
-#   define CMS_F_CMS_DECRYPT_SET1_PKEY                      0
-#   define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX               0
-#   define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO               0
-#   define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                  0
-#   define CMS_F_CMS_DIGEST_VERIFY                          0
-#   define CMS_F_CMS_ENCODE_RECEIPT                         0
-#   define CMS_F_CMS_ENCRYPT                                0
-#   define CMS_F_CMS_ENCRYPTEDCONTENT_INIT                  0
-#   define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO              0
-#   define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                  0
-#   define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                  0
-#   define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                 0
-#   define CMS_F_CMS_ENVELOPEDDATA_CREATE                   0
-#   define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                 0
-#   define CMS_F_CMS_ENVELOPED_DATA_INIT                    0
-#   define CMS_F_CMS_ENV_ASN1_CTRL                          0
-#   define CMS_F_CMS_FINAL                                  0
-#   define CMS_F_CMS_GET0_CERTIFICATE_CHOICES               0
-#   define CMS_F_CMS_GET0_CONTENT                           0
-#   define CMS_F_CMS_GET0_ECONTENT_TYPE                     0
-#   define CMS_F_CMS_GET0_ENVELOPED                         0
-#   define CMS_F_CMS_GET0_REVOCATION_CHOICES                0
-#   define CMS_F_CMS_GET0_SIGNED                            0
-#   define CMS_F_CMS_MSGSIGDIGEST_ADD1                      0
-#   define CMS_F_CMS_RECEIPTREQUEST_CREATE0                 0
-#   define CMS_F_CMS_RECEIPT_VERIFY                         0
-#   define CMS_F_CMS_RECIPIENTINFO_DECRYPT                  0
-#   define CMS_F_CMS_RECIPIENTINFO_ENCRYPT                  0
-#   define CMS_F_CMS_RECIPIENTINFO_KARI_ENCRYPT             0
-#   define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ALG            0
-#   define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ORIG_ID        0
-#   define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_REKS           0
-#   define CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP         0
-#   define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT            0
-#   define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT            0
-#   define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID            0
-#   define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP             0
-#   define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP            0
-#   define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT             0
-#   define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT             0
-#   define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS           0
-#   define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID      0
-#   define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT               0
-#   define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                 0
-#   define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD            0
-#   define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY                0
-#   define CMS_F_CMS_SD_ASN1_CTRL                           0
-#   define CMS_F_CMS_SET1_IAS                               0
-#   define CMS_F_CMS_SET1_KEYID                             0
-#   define CMS_F_CMS_SET1_SIGNERIDENTIFIER                  0
-#   define CMS_F_CMS_SET_DETACHED                           0
-#   define CMS_F_CMS_SIGN                                   0
-#   define CMS_F_CMS_SIGNED_DATA_INIT                       0
-#   define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN                0
-#   define CMS_F_CMS_SIGNERINFO_SIGN                        0
-#   define CMS_F_CMS_SIGNERINFO_VERIFY                      0
-#   define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 0
-#   define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              0
-#   define CMS_F_CMS_SIGN_RECEIPT                           0
-#   define CMS_F_CMS_SI_CHECK_ATTRIBUTES                    0
-#   define CMS_F_CMS_STREAM                                 0
-#   define CMS_F_CMS_UNCOMPRESS                             0
-#   define CMS_F_CMS_VERIFY                                 0
-#   define CMS_F_KEK_UNWRAP_KEY                             0
-#  endif
+#define CMS_F_CHECK_CONTENT 0
+#define CMS_F_CMS_ADD0_CERT 0
+#define CMS_F_CMS_ADD0_RECIPIENT_KEY 0
+#define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD 0
+#define CMS_F_CMS_ADD1_RECEIPTREQUEST 0
+#define CMS_F_CMS_ADD1_RECIPIENT_CERT 0
+#define CMS_F_CMS_ADD1_SIGNER 0
+#define CMS_F_CMS_ADD1_SIGNINGTIME 0
+#define CMS_F_CMS_COMPRESS 0
+#define CMS_F_CMS_COMPRESSEDDATA_CREATE 0
+#define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO 0
+#define CMS_F_CMS_COPY_CONTENT 0
+#define CMS_F_CMS_COPY_MESSAGEDIGEST 0
+#define CMS_F_CMS_DATA 0
+#define CMS_F_CMS_DATAFINAL 0
+#define CMS_F_CMS_DATAINIT 0
+#define CMS_F_CMS_DECRYPT 0
+#define CMS_F_CMS_DECRYPT_SET1_KEY 0
+#define CMS_F_CMS_DECRYPT_SET1_PASSWORD 0
+#define CMS_F_CMS_DECRYPT_SET1_PKEY 0
+#define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX 0
+#define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO 0
+#define CMS_F_CMS_DIGESTEDDATA_DO_FINAL 0
+#define CMS_F_CMS_DIGEST_VERIFY 0
+#define CMS_F_CMS_ENCODE_RECEIPT 0
+#define CMS_F_CMS_ENCRYPT 0
+#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT 0
+#define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO 0
+#define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT 0
+#define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT 0
+#define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY 0
+#define CMS_F_CMS_ENVELOPEDDATA_CREATE 0
+#define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO 0
+#define CMS_F_CMS_ENVELOPED_DATA_INIT 0
+#define CMS_F_CMS_ENV_ASN1_CTRL 0
+#define CMS_F_CMS_FINAL 0
+#define CMS_F_CMS_GET0_CERTIFICATE_CHOICES 0
+#define CMS_F_CMS_GET0_CONTENT 0
+#define CMS_F_CMS_GET0_ECONTENT_TYPE 0
+#define CMS_F_CMS_GET0_ENVELOPED 0
+#define CMS_F_CMS_GET0_REVOCATION_CHOICES 0
+#define CMS_F_CMS_GET0_SIGNED 0
+#define CMS_F_CMS_MSGSIGDIGEST_ADD1 0
+#define CMS_F_CMS_RECEIPTREQUEST_CREATE0 0
+#define CMS_F_CMS_RECEIPT_VERIFY 0
+#define CMS_F_CMS_RECIPIENTINFO_DECRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_ENCRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_KARI_ENCRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ALG 0
+#define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_ORIG_ID 0
+#define CMS_F_CMS_RECIPIENTINFO_KARI_GET0_REKS 0
+#define CMS_F_CMS_RECIPIENTINFO_KARI_ORIG_ID_CMP 0
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID 0
+#define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP 0
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP 0
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS 0
+#define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID 0
+#define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT 0
+#define CMS_F_CMS_RECIPIENTINFO_SET0_KEY 0
+#define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD 0
+#define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY 0
+#define CMS_F_CMS_SD_ASN1_CTRL 0
+#define CMS_F_CMS_SET1_IAS 0
+#define CMS_F_CMS_SET1_KEYID 0
+#define CMS_F_CMS_SET1_SIGNERIDENTIFIER 0
+#define CMS_F_CMS_SET_DETACHED 0
+#define CMS_F_CMS_SIGN 0
+#define CMS_F_CMS_SIGNED_DATA_INIT 0
+#define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN 0
+#define CMS_F_CMS_SIGNERINFO_SIGN 0
+#define CMS_F_CMS_SIGNERINFO_VERIFY 0
+#define CMS_F_CMS_SIGNERINFO_VERIFY_CERT 0
+#define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT 0
+#define CMS_F_CMS_SIGN_RECEIPT 0
+#define CMS_F_CMS_SI_CHECK_ATTRIBUTES 0
+#define CMS_F_CMS_STREAM 0
+#define CMS_F_CMS_UNCOMPRESS 0
+#define CMS_F_CMS_VERIFY 0
+#define CMS_F_KEK_UNWRAP_KEY 0
+#endif
 
-#  ifndef OPENSSL_NO_COMP
+#ifndef OPENSSL_NO_COMP
 /*
  * COMP function codes.
  */
-#   define COMP_F_BIO_ZLIB_FLUSH                            0
-#   define COMP_F_BIO_ZLIB_NEW                              0
-#   define COMP_F_BIO_ZLIB_READ                             0
-#   define COMP_F_BIO_ZLIB_WRITE                            0
-#   define COMP_F_COMP_CTX_NEW                              0
-#  endif
+#define COMP_F_BIO_ZLIB_FLUSH 0
+#define COMP_F_BIO_ZLIB_NEW 0
+#define COMP_F_BIO_ZLIB_READ 0
+#define COMP_F_BIO_ZLIB_WRITE 0
+#define COMP_F_COMP_CTX_NEW 0
+#endif
 
 /*
  * CONF function codes.
  */
-#  define CONF_F_CONF_DUMP_FP                              0
-#  define CONF_F_CONF_LOAD                                 0
-#  define CONF_F_CONF_LOAD_FP                              0
-#  define CONF_F_CONF_PARSE_LIST                           0
-#  define CONF_F_DEF_LOAD                                  0
-#  define CONF_F_DEF_LOAD_BIO                              0
-#  define CONF_F_GET_NEXT_FILE                             0
-#  define CONF_F_MODULE_ADD                                0
-#  define CONF_F_MODULE_INIT                               0
-#  define CONF_F_MODULE_LOAD_DSO                           0
-#  define CONF_F_MODULE_RUN                                0
-#  define CONF_F_NCONF_DUMP_BIO                            0
-#  define CONF_F_NCONF_DUMP_FP                             0
-#  define CONF_F_NCONF_GET_NUMBER_E                        0
-#  define CONF_F_NCONF_GET_SECTION                         0
-#  define CONF_F_NCONF_GET_STRING                          0
-#  define CONF_F_NCONF_LOAD                                0
-#  define CONF_F_NCONF_LOAD_BIO                            0
-#  define CONF_F_NCONF_LOAD_FP                             0
-#  define CONF_F_NCONF_NEW                                 0
-#  define CONF_F_PROCESS_INCLUDE                           0
-#  define CONF_F_SSL_MODULE_INIT                           0
-#  define CONF_F_STR_COPY                                  0
+#define CONF_F_CONF_DUMP_FP 0
+#define CONF_F_CONF_LOAD 0
+#define CONF_F_CONF_LOAD_FP 0
+#define CONF_F_CONF_PARSE_LIST 0
+#define CONF_F_DEF_LOAD 0
+#define CONF_F_DEF_LOAD_BIO 0
+#define CONF_F_GET_NEXT_FILE 0
+#define CONF_F_MODULE_ADD 0
+#define CONF_F_MODULE_INIT 0
+#define CONF_F_MODULE_LOAD_DSO 0
+#define CONF_F_MODULE_RUN 0
+#define CONF_F_NCONF_DUMP_BIO 0
+#define CONF_F_NCONF_DUMP_FP 0
+#define CONF_F_NCONF_GET_NUMBER_E 0
+#define CONF_F_NCONF_GET_SECTION 0
+#define CONF_F_NCONF_GET_STRING 0
+#define CONF_F_NCONF_LOAD 0
+#define CONF_F_NCONF_LOAD_BIO 0
+#define CONF_F_NCONF_LOAD_FP 0
+#define CONF_F_NCONF_NEW 0
+#define CONF_F_PROCESS_INCLUDE 0
+#define CONF_F_SSL_MODULE_INIT 0
+#define CONF_F_STR_COPY 0
 
 /*
  * CRYPTO function codes.
  */
-#  define CRYPTO_F_CMAC_CTX_NEW                            0
-#  define CRYPTO_F_CRYPTO_DUP_EX_DATA                      0
-#  define CRYPTO_F_CRYPTO_FREE_EX_DATA                     0
-#  define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX                 0
-#  define CRYPTO_F_CRYPTO_MEMDUP                           0
-#  define CRYPTO_F_CRYPTO_NEW_EX_DATA                      0
-#  define CRYPTO_F_CRYPTO_OCB128_COPY_CTX                  0
-#  define CRYPTO_F_CRYPTO_OCB128_INIT                      0
-#  define CRYPTO_F_CRYPTO_SET_EX_DATA                      0
-#  define CRYPTO_F_GET_AND_LOCK                            0
-#  define CRYPTO_F_OPENSSL_ATEXIT                          0
-#  define CRYPTO_F_OPENSSL_BUF2HEXSTR                      0
-#  define CRYPTO_F_OPENSSL_FOPEN                           0
-#  define CRYPTO_F_OPENSSL_HEXSTR2BUF                      0
-#  define CRYPTO_F_OPENSSL_INIT_CRYPTO                     0
-#  define CRYPTO_F_OPENSSL_LH_NEW                          0
-#  define CRYPTO_F_OPENSSL_SK_DEEP_COPY                    0
-#  define CRYPTO_F_OPENSSL_SK_DUP                          0
-#  define CRYPTO_F_PKEY_HMAC_INIT                          0
-#  define CRYPTO_F_PKEY_POLY1305_INIT                      0
-#  define CRYPTO_F_PKEY_SIPHASH_INIT                       0
-#  define CRYPTO_F_SK_RESERVE                              0
+#define CRYPTO_F_CMAC_CTX_NEW 0
+#define CRYPTO_F_CRYPTO_DUP_EX_DATA 0
+#define CRYPTO_F_CRYPTO_FREE_EX_DATA 0
+#define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX 0
+#define CRYPTO_F_CRYPTO_MEMDUP 0
+#define CRYPTO_F_CRYPTO_NEW_EX_DATA 0
+#define CRYPTO_F_CRYPTO_OCB128_COPY_CTX 0
+#define CRYPTO_F_CRYPTO_OCB128_INIT 0
+#define CRYPTO_F_CRYPTO_SET_EX_DATA 0
+#define CRYPTO_F_GET_AND_LOCK 0
+#define CRYPTO_F_OPENSSL_ATEXIT 0
+#define CRYPTO_F_OPENSSL_BUF2HEXSTR 0
+#define CRYPTO_F_OPENSSL_FOPEN 0
+#define CRYPTO_F_OPENSSL_HEXSTR2BUF 0
+#define CRYPTO_F_OPENSSL_INIT_CRYPTO 0
+#define CRYPTO_F_OPENSSL_LH_NEW 0
+#define CRYPTO_F_OPENSSL_SK_DEEP_COPY 0
+#define CRYPTO_F_OPENSSL_SK_DUP 0
+#define CRYPTO_F_PKEY_HMAC_INIT 0
+#define CRYPTO_F_PKEY_POLY1305_INIT 0
+#define CRYPTO_F_PKEY_SIPHASH_INIT 0
+#define CRYPTO_F_SK_RESERVE 0
 
-#  ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 /*
  * CT function codes.
  */
-#   define CT_F_CTLOG_NEW                                   0
-#   define CT_F_CTLOG_NEW_FROM_BASE64                       0
-#   define CT_F_CTLOG_NEW_FROM_CONF                         0
-#   define CT_F_CTLOG_STORE_LOAD_CTX_NEW                    0
-#   define CT_F_CTLOG_STORE_LOAD_FILE                       0
-#   define CT_F_CTLOG_STORE_LOAD_LOG                        0
-#   define CT_F_CTLOG_STORE_NEW                             0
-#   define CT_F_CT_BASE64_DECODE                            0
-#   define CT_F_CT_POLICY_EVAL_CTX_NEW                      0
-#   define CT_F_CT_V1_LOG_ID_FROM_PKEY                      0
-#   define CT_F_I2O_SCT                                     0
-#   define CT_F_I2O_SCT_LIST                                0
-#   define CT_F_I2O_SCT_SIGNATURE                           0
-#   define CT_F_O2I_SCT                                     0
-#   define CT_F_O2I_SCT_LIST                                0
-#   define CT_F_O2I_SCT_SIGNATURE                           0
-#   define CT_F_SCT_CTX_NEW                                 0
-#   define CT_F_SCT_CTX_VERIFY                              0
-#   define CT_F_SCT_NEW                                     0
-#   define CT_F_SCT_NEW_FROM_BASE64                         0
-#   define CT_F_SCT_SET0_LOG_ID                             0
-#   define CT_F_SCT_SET1_EXTENSIONS                         0
-#   define CT_F_SCT_SET1_LOG_ID                             0
-#   define CT_F_SCT_SET1_SIGNATURE                          0
-#   define CT_F_SCT_SET_LOG_ENTRY_TYPE                      0
-#   define CT_F_SCT_SET_SIGNATURE_NID                       0
-#   define CT_F_SCT_SET_VERSION                             0
-#  endif
+#define CT_F_CTLOG_NEW 0
+#define CT_F_CTLOG_NEW_FROM_BASE64 0
+#define CT_F_CTLOG_NEW_FROM_CONF 0
+#define CT_F_CTLOG_STORE_LOAD_CTX_NEW 0
+#define CT_F_CTLOG_STORE_LOAD_FILE 0
+#define CT_F_CTLOG_STORE_LOAD_LOG 0
+#define CT_F_CTLOG_STORE_NEW 0
+#define CT_F_CT_BASE64_DECODE 0
+#define CT_F_CT_POLICY_EVAL_CTX_NEW 0
+#define CT_F_CT_V1_LOG_ID_FROM_PKEY 0
+#define CT_F_I2O_SCT 0
+#define CT_F_I2O_SCT_LIST 0
+#define CT_F_I2O_SCT_SIGNATURE 0
+#define CT_F_O2I_SCT 0
+#define CT_F_O2I_SCT_LIST 0
+#define CT_F_O2I_SCT_SIGNATURE 0
+#define CT_F_SCT_CTX_NEW 0
+#define CT_F_SCT_CTX_VERIFY 0
+#define CT_F_SCT_NEW 0
+#define CT_F_SCT_NEW_FROM_BASE64 0
+#define CT_F_SCT_SET0_LOG_ID 0
+#define CT_F_SCT_SET1_EXTENSIONS 0
+#define CT_F_SCT_SET1_LOG_ID 0
+#define CT_F_SCT_SET1_SIGNATURE 0
+#define CT_F_SCT_SET_LOG_ENTRY_TYPE 0
+#define CT_F_SCT_SET_SIGNATURE_NID 0
+#define CT_F_SCT_SET_VERSION 0
+#endif
 
-#  ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 /*
  * DH function codes.
  */
-#   define DH_F_COMPUTE_KEY                                 0
-#   define DH_F_DHPARAMS_PRINT_FP                           0
-#   define DH_F_DH_BUILTIN_GENPARAMS                        0
-#   define DH_F_DH_CHECK_EX                                 0
-#   define DH_F_DH_CHECK_PARAMS_EX                          0
-#   define DH_F_DH_CHECK_PUB_KEY_EX                         0
-#   define DH_F_DH_CMS_DECRYPT                              0
-#   define DH_F_DH_CMS_SET_PEERKEY                          0
-#   define DH_F_DH_CMS_SET_SHARED_INFO                      0
-#   define DH_F_DH_METH_DUP                                 0
-#   define DH_F_DH_METH_NEW                                 0
-#   define DH_F_DH_METH_SET1_NAME                           0
-#   define DH_F_DH_NEW_BY_NID                               0
-#   define DH_F_DH_NEW_METHOD                               0
-#   define DH_F_DH_PARAM_DECODE                             0
-#   define DH_F_DH_PKEY_PUBLIC_CHECK                        0
-#   define DH_F_DH_PRIV_DECODE                              0
-#   define DH_F_DH_PRIV_ENCODE                              0
-#   define DH_F_DH_PUB_DECODE                               0
-#   define DH_F_DH_PUB_ENCODE                               0
-#   define DH_F_DO_DH_PRINT                                 0
-#   define DH_F_GENERATE_KEY                                0
-#   define DH_F_PKEY_DH_CTRL_STR                            0
-#   define DH_F_PKEY_DH_DERIVE                              0
-#   define DH_F_PKEY_DH_INIT                                0
-#   define DH_F_PKEY_DH_KEYGEN                              0
-#  endif
+#define DH_F_COMPUTE_KEY 0
+#define DH_F_DHPARAMS_PRINT_FP 0
+#define DH_F_DH_BUILTIN_GENPARAMS 0
+#define DH_F_DH_CHECK_EX 0
+#define DH_F_DH_CHECK_PARAMS_EX 0
+#define DH_F_DH_CHECK_PUB_KEY_EX 0
+#define DH_F_DH_CMS_DECRYPT 0
+#define DH_F_DH_CMS_SET_PEERKEY 0
+#define DH_F_DH_CMS_SET_SHARED_INFO 0
+#define DH_F_DH_METH_DUP 0
+#define DH_F_DH_METH_NEW 0
+#define DH_F_DH_METH_SET1_NAME 0
+#define DH_F_DH_NEW_BY_NID 0
+#define DH_F_DH_NEW_METHOD 0
+#define DH_F_DH_PARAM_DECODE 0
+#define DH_F_DH_PKEY_PUBLIC_CHECK 0
+#define DH_F_DH_PRIV_DECODE 0
+#define DH_F_DH_PRIV_ENCODE 0
+#define DH_F_DH_PUB_DECODE 0
+#define DH_F_DH_PUB_ENCODE 0
+#define DH_F_DO_DH_PRINT 0
+#define DH_F_GENERATE_KEY 0
+#define DH_F_PKEY_DH_CTRL_STR 0
+#define DH_F_PKEY_DH_DERIVE 0
+#define DH_F_PKEY_DH_INIT 0
+#define DH_F_PKEY_DH_KEYGEN 0
+#endif
 
-#  ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 /*
  * DSA function codes.
  */
-#   define DSA_F_DSAPARAMS_PRINT                            0
-#   define DSA_F_DSAPARAMS_PRINT_FP                         0
-#   define DSA_F_DSA_BUILTIN_PARAMGEN                       0
-#   define DSA_F_DSA_BUILTIN_PARAMGEN2                      0
-#   define DSA_F_DSA_DO_SIGN                                0
-#   define DSA_F_DSA_DO_VERIFY                              0
-#   define DSA_F_DSA_METH_DUP                               0
-#   define DSA_F_DSA_METH_NEW                               0
-#   define DSA_F_DSA_METH_SET1_NAME                         0
-#   define DSA_F_DSA_NEW_METHOD                             0
-#   define DSA_F_DSA_PARAM_DECODE                           0
-#   define DSA_F_DSA_PRINT_FP                               0
-#   define DSA_F_DSA_PRIV_DECODE                            0
-#   define DSA_F_DSA_PRIV_ENCODE                            0
-#   define DSA_F_DSA_PUB_DECODE                             0
-#   define DSA_F_DSA_PUB_ENCODE                             0
-#   define DSA_F_DSA_SIGN                                   0
-#   define DSA_F_DSA_SIGN_SETUP                             0
-#   define DSA_F_DSA_SIG_NEW                                0
-#   define DSA_F_OLD_DSA_PRIV_DECODE                        0
-#   define DSA_F_PKEY_DSA_CTRL                              0
-#   define DSA_F_PKEY_DSA_CTRL_STR                          0
-#   define DSA_F_PKEY_DSA_KEYGEN                            0
-#  endif
+#define DSA_F_DSAPARAMS_PRINT 0
+#define DSA_F_DSAPARAMS_PRINT_FP 0
+#define DSA_F_DSA_BUILTIN_PARAMGEN 0
+#define DSA_F_DSA_BUILTIN_PARAMGEN2 0
+#define DSA_F_DSA_DO_SIGN 0
+#define DSA_F_DSA_DO_VERIFY 0
+#define DSA_F_DSA_METH_DUP 0
+#define DSA_F_DSA_METH_NEW 0
+#define DSA_F_DSA_METH_SET1_NAME 0
+#define DSA_F_DSA_NEW_METHOD 0
+#define DSA_F_DSA_PARAM_DECODE 0
+#define DSA_F_DSA_PRINT_FP 0
+#define DSA_F_DSA_PRIV_DECODE 0
+#define DSA_F_DSA_PRIV_ENCODE 0
+#define DSA_F_DSA_PUB_DECODE 0
+#define DSA_F_DSA_PUB_ENCODE 0
+#define DSA_F_DSA_SIGN 0
+#define DSA_F_DSA_SIGN_SETUP 0
+#define DSA_F_DSA_SIG_NEW 0
+#define DSA_F_OLD_DSA_PRIV_DECODE 0
+#define DSA_F_PKEY_DSA_CTRL 0
+#define DSA_F_PKEY_DSA_CTRL_STR 0
+#define DSA_F_PKEY_DSA_KEYGEN 0
+#endif
 
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 /*
  * EC function codes.
  */
-#   define EC_F_BN_TO_FELEM                                 0
-#   define EC_F_D2I_ECPARAMETERS                            0
-#   define EC_F_D2I_ECPKPARAMETERS                          0
-#   define EC_F_D2I_ECPRIVATEKEY                            0
-#   define EC_F_DO_EC_KEY_PRINT                             0
-#   define EC_F_ECDH_CMS_DECRYPT                            0
-#   define EC_F_ECDH_CMS_SET_SHARED_INFO                    0
-#   define EC_F_ECDH_COMPUTE_KEY                            0
-#   define EC_F_ECDH_SIMPLE_COMPUTE_KEY                     0
-#   define EC_F_ECDSA_DO_SIGN_EX                            0
-#   define EC_F_ECDSA_DO_VERIFY                             0
-#   define EC_F_ECDSA_SIGN_EX                               0
-#   define EC_F_ECDSA_SIGN_SETUP                            0
-#   define EC_F_ECDSA_SIG_NEW                               0
-#   define EC_F_ECDSA_VERIFY                                0
-#   define EC_F_ECD_ITEM_VERIFY                             0
-#   define EC_F_ECKEY_PARAM2TYPE                            0
-#   define EC_F_ECKEY_PARAM_DECODE                          0
-#   define EC_F_ECKEY_PRIV_DECODE                           0
-#   define EC_F_ECKEY_PRIV_ENCODE                           0
-#   define EC_F_ECKEY_PUB_DECODE                            0
-#   define EC_F_ECKEY_PUB_ENCODE                            0
-#   define EC_F_ECKEY_TYPE2PARAM                            0
-#   define EC_F_ECPARAMETERS_PRINT                          0
-#   define EC_F_ECPARAMETERS_PRINT_FP                       0
-#   define EC_F_ECPKPARAMETERS_PRINT                        0
-#   define EC_F_ECPKPARAMETERS_PRINT_FP                     0
-#   define EC_F_ECP_NISTZ256_GET_AFFINE                     0
-#   define EC_F_ECP_NISTZ256_INV_MOD_ORD                    0
-#   define EC_F_ECP_NISTZ256_MULT_PRECOMPUTE                0
-#   define EC_F_ECP_NISTZ256_POINTS_MUL                     0
-#   define EC_F_ECP_NISTZ256_PRE_COMP_NEW                   0
-#   define EC_F_ECP_NISTZ256_WINDOWED_MUL                   0
-#   define EC_F_ECX_KEY_OP                                  0
-#   define EC_F_ECX_PRIV_ENCODE                             0
-#   define EC_F_ECX_PUB_ENCODE                              0
-#   define EC_F_EC_ASN1_GROUP2CURVE                         0
-#   define EC_F_EC_ASN1_GROUP2FIELDID                       0
-#   define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY           0
-#   define EC_F_EC_GF2M_SIMPLE_FIELD_INV                    0
-#   define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT     0
-#   define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE              0
-#   define EC_F_EC_GF2M_SIMPLE_LADDER_POST                  0
-#   define EC_F_EC_GF2M_SIMPLE_LADDER_PRE                   0
-#   define EC_F_EC_GF2M_SIMPLE_OCT2POINT                    0
-#   define EC_F_EC_GF2M_SIMPLE_POINT2OCT                    0
-#   define EC_F_EC_GF2M_SIMPLE_POINTS_MUL                   0
-#   define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 0
-#   define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 0
-#   define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES   0
-#   define EC_F_EC_GFP_MONT_FIELD_DECODE                    0
-#   define EC_F_EC_GFP_MONT_FIELD_ENCODE                    0
-#   define EC_F_EC_GFP_MONT_FIELD_INV                       0
-#   define EC_F_EC_GFP_MONT_FIELD_MUL                       0
-#   define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE                0
-#   define EC_F_EC_GFP_MONT_FIELD_SQR                       0
-#   define EC_F_EC_GFP_MONT_GROUP_SET_CURVE                 0
-#   define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE             0
-#   define EC_F_EC_GFP_NISTP224_POINTS_MUL                  0
-#   define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 0
-#   define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE             0
-#   define EC_F_EC_GFP_NISTP256_POINTS_MUL                  0
-#   define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 0
-#   define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE             0
-#   define EC_F_EC_GFP_NISTP521_POINTS_MUL                  0
-#   define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 0
-#   define EC_F_EC_GFP_NIST_FIELD_MUL                       0
-#   define EC_F_EC_GFP_NIST_FIELD_SQR                       0
-#   define EC_F_EC_GFP_NIST_GROUP_SET_CURVE                 0
-#   define EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES             0
-#   define EC_F_EC_GFP_SIMPLE_FIELD_INV                     0
-#   define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT      0
-#   define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE               0
-#   define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE                   0
-#   define EC_F_EC_GFP_SIMPLE_OCT2POINT                     0
-#   define EC_F_EC_GFP_SIMPLE_POINT2OCT                     0
-#   define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE            0
-#   define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES  0
-#   define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES  0
-#   define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES    0
-#   define EC_F_EC_GROUP_CHECK                              0
-#   define EC_F_EC_GROUP_CHECK_DISCRIMINANT                 0
-#   define EC_F_EC_GROUP_COPY                               0
-#   define EC_F_EC_GROUP_GET_CURVE                          0
-#   define EC_F_EC_GROUP_GET_CURVE_GF2M                     0
-#   define EC_F_EC_GROUP_GET_CURVE_GFP                      0
-#   define EC_F_EC_GROUP_GET_DEGREE                         0
-#   define EC_F_EC_GROUP_GET_ECPARAMETERS                   0
-#   define EC_F_EC_GROUP_GET_ECPKPARAMETERS                 0
-#   define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS              0
-#   define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS                0
-#   define EC_F_EC_GROUP_NEW                                0
-#   define EC_F_EC_GROUP_NEW_BY_CURVE_NAME                  0
-#   define EC_F_EC_GROUP_NEW_FROM_DATA                      0
-#   define EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS              0
-#   define EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS            0
-#   define EC_F_EC_GROUP_SET_CURVE                          0
-#   define EC_F_EC_GROUP_SET_CURVE_GF2M                     0
-#   define EC_F_EC_GROUP_SET_CURVE_GFP                      0
-#   define EC_F_EC_GROUP_SET_GENERATOR                      0
-#   define EC_F_EC_GROUP_SET_SEED                           0
-#   define EC_F_EC_KEY_CHECK_KEY                            0
-#   define EC_F_EC_KEY_COPY                                 0
-#   define EC_F_EC_KEY_GENERATE_KEY                         0
-#   define EC_F_EC_KEY_NEW                                  0
-#   define EC_F_EC_KEY_NEW_METHOD                           0
-#   define EC_F_EC_KEY_OCT2PRIV                             0
-#   define EC_F_EC_KEY_PRINT                                0
-#   define EC_F_EC_KEY_PRINT_FP                             0
-#   define EC_F_EC_KEY_PRIV2BUF                             0
-#   define EC_F_EC_KEY_PRIV2OCT                             0
-#   define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES    0
-#   define EC_F_EC_KEY_SIMPLE_CHECK_KEY                     0
-#   define EC_F_EC_KEY_SIMPLE_OCT2PRIV                      0
-#   define EC_F_EC_KEY_SIMPLE_PRIV2OCT                      0
-#   define EC_F_EC_PKEY_CHECK                               0
-#   define EC_F_EC_PKEY_PARAM_CHECK                         0
-#   define EC_F_EC_POINTS_MAKE_AFFINE                       0
-#   define EC_F_EC_POINTS_MUL                               0
-#   define EC_F_EC_POINT_ADD                                0
-#   define EC_F_EC_POINT_BN2POINT                           0
-#   define EC_F_EC_POINT_CMP                                0
-#   define EC_F_EC_POINT_COPY                               0
-#   define EC_F_EC_POINT_DBL                                0
-#   define EC_F_EC_POINT_GET_AFFINE_COORDINATES             0
-#   define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M        0
-#   define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP         0
-#   define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP    0
-#   define EC_F_EC_POINT_INVERT                             0
-#   define EC_F_EC_POINT_IS_AT_INFINITY                     0
-#   define EC_F_EC_POINT_IS_ON_CURVE                        0
-#   define EC_F_EC_POINT_MAKE_AFFINE                        0
-#   define EC_F_EC_POINT_NEW                                0
-#   define EC_F_EC_POINT_OCT2POINT                          0
-#   define EC_F_EC_POINT_POINT2BUF                          0
-#   define EC_F_EC_POINT_POINT2OCT                          0
-#   define EC_F_EC_POINT_SET_AFFINE_COORDINATES             0
-#   define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M        0
-#   define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP         0
-#   define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES         0
-#   define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M    0
-#   define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP     0
-#   define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP    0
-#   define EC_F_EC_POINT_SET_TO_INFINITY                    0
-#   define EC_F_EC_PRE_COMP_NEW                             0
-#   define EC_F_EC_SCALAR_MUL_LADDER                        0
-#   define EC_F_EC_WNAF_MUL                                 0
-#   define EC_F_EC_WNAF_PRECOMPUTE_MULT                     0
-#   define EC_F_I2D_ECPARAMETERS                            0
-#   define EC_F_I2D_ECPKPARAMETERS                          0
-#   define EC_F_I2D_ECPRIVATEKEY                            0
-#   define EC_F_I2O_ECPUBLICKEY                             0
-#   define EC_F_NISTP224_PRE_COMP_NEW                       0
-#   define EC_F_NISTP256_PRE_COMP_NEW                       0
-#   define EC_F_NISTP521_PRE_COMP_NEW                       0
-#   define EC_F_O2I_ECPUBLICKEY                             0
-#   define EC_F_OLD_EC_PRIV_DECODE                          0
-#   define EC_F_OSSL_ECDH_COMPUTE_KEY                       0
-#   define EC_F_OSSL_ECDSA_SIGN_SIG                         0
-#   define EC_F_OSSL_ECDSA_VERIFY_SIG                       0
-#   define EC_F_PKEY_ECD_CTRL                               0
-#   define EC_F_PKEY_ECD_DIGESTSIGN                         0
-#   define EC_F_PKEY_ECD_DIGESTSIGN25519                    0
-#   define EC_F_PKEY_ECD_DIGESTSIGN448                      0
-#   define EC_F_PKEY_ECX_DERIVE                             0
-#   define EC_F_PKEY_EC_CTRL                                0
-#   define EC_F_PKEY_EC_CTRL_STR                            0
-#   define EC_F_PKEY_EC_DERIVE                              0
-#   define EC_F_PKEY_EC_INIT                                0
-#   define EC_F_PKEY_EC_KDF_DERIVE                          0
-#   define EC_F_PKEY_EC_KEYGEN                              0
-#   define EC_F_PKEY_EC_PARAMGEN                            0
-#   define EC_F_PKEY_EC_SIGN                                0
-#   define EC_F_VALIDATE_ECX_DERIVE                         0
-#  endif
+#define EC_F_BN_TO_FELEM 0
+#define EC_F_D2I_ECPARAMETERS 0
+#define EC_F_D2I_ECPKPARAMETERS 0
+#define EC_F_D2I_ECPRIVATEKEY 0
+#define EC_F_DO_EC_KEY_PRINT 0
+#define EC_F_ECDH_CMS_DECRYPT 0
+#define EC_F_ECDH_CMS_SET_SHARED_INFO 0
+#define EC_F_ECDH_COMPUTE_KEY 0
+#define EC_F_ECDH_SIMPLE_COMPUTE_KEY 0
+#define EC_F_ECDSA_DO_SIGN_EX 0
+#define EC_F_ECDSA_DO_VERIFY 0
+#define EC_F_ECDSA_SIGN_EX 0
+#define EC_F_ECDSA_SIGN_SETUP 0
+#define EC_F_ECDSA_SIG_NEW 0
+#define EC_F_ECDSA_VERIFY 0
+#define EC_F_ECD_ITEM_VERIFY 0
+#define EC_F_ECKEY_PARAM2TYPE 0
+#define EC_F_ECKEY_PARAM_DECODE 0
+#define EC_F_ECKEY_PRIV_DECODE 0
+#define EC_F_ECKEY_PRIV_ENCODE 0
+#define EC_F_ECKEY_PUB_DECODE 0
+#define EC_F_ECKEY_PUB_ENCODE 0
+#define EC_F_ECKEY_TYPE2PARAM 0
+#define EC_F_ECPARAMETERS_PRINT 0
+#define EC_F_ECPARAMETERS_PRINT_FP 0
+#define EC_F_ECPKPARAMETERS_PRINT 0
+#define EC_F_ECPKPARAMETERS_PRINT_FP 0
+#define EC_F_ECP_NISTZ256_GET_AFFINE 0
+#define EC_F_ECP_NISTZ256_INV_MOD_ORD 0
+#define EC_F_ECP_NISTZ256_MULT_PRECOMPUTE 0
+#define EC_F_ECP_NISTZ256_POINTS_MUL 0
+#define EC_F_ECP_NISTZ256_PRE_COMP_NEW 0
+#define EC_F_ECP_NISTZ256_WINDOWED_MUL 0
+#define EC_F_ECX_KEY_OP 0
+#define EC_F_ECX_PRIV_ENCODE 0
+#define EC_F_ECX_PUB_ENCODE 0
+#define EC_F_EC_ASN1_GROUP2CURVE 0
+#define EC_F_EC_ASN1_GROUP2FIELDID 0
+#define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY 0
+#define EC_F_EC_GF2M_SIMPLE_FIELD_INV 0
+#define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT 0
+#define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE 0
+#define EC_F_EC_GF2M_SIMPLE_LADDER_POST 0
+#define EC_F_EC_GF2M_SIMPLE_LADDER_PRE 0
+#define EC_F_EC_GF2M_SIMPLE_OCT2POINT 0
+#define EC_F_EC_GF2M_SIMPLE_POINT2OCT 0
+#define EC_F_EC_GF2M_SIMPLE_POINTS_MUL 0
+#define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 0
+#define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 0
+#define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES 0
+#define EC_F_EC_GFP_MONT_FIELD_DECODE 0
+#define EC_F_EC_GFP_MONT_FIELD_ENCODE 0
+#define EC_F_EC_GFP_MONT_FIELD_INV 0
+#define EC_F_EC_GFP_MONT_FIELD_MUL 0
+#define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE 0
+#define EC_F_EC_GFP_MONT_FIELD_SQR 0
+#define EC_F_EC_GFP_MONT_GROUP_SET_CURVE 0
+#define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE 0
+#define EC_F_EC_GFP_NISTP224_POINTS_MUL 0
+#define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 0
+#define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE 0
+#define EC_F_EC_GFP_NISTP256_POINTS_MUL 0
+#define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 0
+#define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE 0
+#define EC_F_EC_GFP_NISTP521_POINTS_MUL 0
+#define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 0
+#define EC_F_EC_GFP_NIST_FIELD_MUL 0
+#define EC_F_EC_GFP_NIST_FIELD_SQR 0
+#define EC_F_EC_GFP_NIST_GROUP_SET_CURVE 0
+#define EC_F_EC_GFP_SIMPLE_BLIND_COORDINATES 0
+#define EC_F_EC_GFP_SIMPLE_FIELD_INV 0
+#define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT 0
+#define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE 0
+#define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE 0
+#define EC_F_EC_GFP_SIMPLE_OCT2POINT 0
+#define EC_F_EC_GFP_SIMPLE_POINT2OCT 0
+#define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE 0
+#define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES 0
+#define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES 0
+#define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES 0
+#define EC_F_EC_GROUP_CHECK 0
+#define EC_F_EC_GROUP_CHECK_DISCRIMINANT 0
+#define EC_F_EC_GROUP_COPY 0
+#define EC_F_EC_GROUP_GET_CURVE 0
+#define EC_F_EC_GROUP_GET_CURVE_GF2M 0
+#define EC_F_EC_GROUP_GET_CURVE_GFP 0
+#define EC_F_EC_GROUP_GET_DEGREE 0
+#define EC_F_EC_GROUP_GET_ECPARAMETERS 0
+#define EC_F_EC_GROUP_GET_ECPKPARAMETERS 0
+#define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS 0
+#define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS 0
+#define EC_F_EC_GROUP_NEW 0
+#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME 0
+#define EC_F_EC_GROUP_NEW_FROM_DATA 0
+#define EC_F_EC_GROUP_NEW_FROM_ECPARAMETERS 0
+#define EC_F_EC_GROUP_NEW_FROM_ECPKPARAMETERS 0
+#define EC_F_EC_GROUP_SET_CURVE 0
+#define EC_F_EC_GROUP_SET_CURVE_GF2M 0
+#define EC_F_EC_GROUP_SET_CURVE_GFP 0
+#define EC_F_EC_GROUP_SET_GENERATOR 0
+#define EC_F_EC_GROUP_SET_SEED 0
+#define EC_F_EC_KEY_CHECK_KEY 0
+#define EC_F_EC_KEY_COPY 0
+#define EC_F_EC_KEY_GENERATE_KEY 0
+#define EC_F_EC_KEY_NEW 0
+#define EC_F_EC_KEY_NEW_METHOD 0
+#define EC_F_EC_KEY_OCT2PRIV 0
+#define EC_F_EC_KEY_PRINT 0
+#define EC_F_EC_KEY_PRINT_FP 0
+#define EC_F_EC_KEY_PRIV2BUF 0
+#define EC_F_EC_KEY_PRIV2OCT 0
+#define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES 0
+#define EC_F_EC_KEY_SIMPLE_CHECK_KEY 0
+#define EC_F_EC_KEY_SIMPLE_OCT2PRIV 0
+#define EC_F_EC_KEY_SIMPLE_PRIV2OCT 0
+#define EC_F_EC_PKEY_CHECK 0
+#define EC_F_EC_PKEY_PARAM_CHECK 0
+#define EC_F_EC_POINTS_MAKE_AFFINE 0
+#define EC_F_EC_POINTS_MUL 0
+#define EC_F_EC_POINT_ADD 0
+#define EC_F_EC_POINT_BN2POINT 0
+#define EC_F_EC_POINT_CMP 0
+#define EC_F_EC_POINT_COPY 0
+#define EC_F_EC_POINT_DBL 0
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES 0
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M 0
+#define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP 0
+#define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP 0
+#define EC_F_EC_POINT_INVERT 0
+#define EC_F_EC_POINT_IS_AT_INFINITY 0
+#define EC_F_EC_POINT_IS_ON_CURVE 0
+#define EC_F_EC_POINT_MAKE_AFFINE 0
+#define EC_F_EC_POINT_NEW 0
+#define EC_F_EC_POINT_OCT2POINT 0
+#define EC_F_EC_POINT_POINT2BUF 0
+#define EC_F_EC_POINT_POINT2OCT 0
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES 0
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M 0
+#define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP 0
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES 0
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M 0
+#define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP 0
+#define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP 0
+#define EC_F_EC_POINT_SET_TO_INFINITY 0
+#define EC_F_EC_PRE_COMP_NEW 0
+#define EC_F_EC_SCALAR_MUL_LADDER 0
+#define EC_F_EC_WNAF_MUL 0
+#define EC_F_EC_WNAF_PRECOMPUTE_MULT 0
+#define EC_F_I2D_ECPARAMETERS 0
+#define EC_F_I2D_ECPKPARAMETERS 0
+#define EC_F_I2D_ECPRIVATEKEY 0
+#define EC_F_I2O_ECPUBLICKEY 0
+#define EC_F_NISTP224_PRE_COMP_NEW 0
+#define EC_F_NISTP256_PRE_COMP_NEW 0
+#define EC_F_NISTP521_PRE_COMP_NEW 0
+#define EC_F_O2I_ECPUBLICKEY 0
+#define EC_F_OLD_EC_PRIV_DECODE 0
+#define EC_F_OSSL_ECDH_COMPUTE_KEY 0
+#define EC_F_OSSL_ECDSA_SIGN_SIG 0
+#define EC_F_OSSL_ECDSA_VERIFY_SIG 0
+#define EC_F_PKEY_ECD_CTRL 0
+#define EC_F_PKEY_ECD_DIGESTSIGN 0
+#define EC_F_PKEY_ECD_DIGESTSIGN25519 0
+#define EC_F_PKEY_ECD_DIGESTSIGN448 0
+#define EC_F_PKEY_ECX_DERIVE 0
+#define EC_F_PKEY_EC_CTRL 0
+#define EC_F_PKEY_EC_CTRL_STR 0
+#define EC_F_PKEY_EC_DERIVE 0
+#define EC_F_PKEY_EC_INIT 0
+#define EC_F_PKEY_EC_KDF_DERIVE 0
+#define EC_F_PKEY_EC_KEYGEN 0
+#define EC_F_PKEY_EC_PARAMGEN 0
+#define EC_F_PKEY_EC_SIGN 0
+#define EC_F_VALIDATE_ECX_DERIVE 0
+#endif
 
-#  ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 /*
  * ENGINE function codes.
  */
-#   define ENGINE_F_DIGEST_UPDATE                           0
-#   define ENGINE_F_DYNAMIC_CTRL                            0
-#   define ENGINE_F_DYNAMIC_GET_DATA_CTX                    0
-#   define ENGINE_F_DYNAMIC_LOAD                            0
-#   define ENGINE_F_DYNAMIC_SET_DATA_CTX                    0
-#   define ENGINE_F_ENGINE_ADD                              0
-#   define ENGINE_F_ENGINE_BY_ID                            0
-#   define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE                0
-#   define ENGINE_F_ENGINE_CTRL                             0
-#   define ENGINE_F_ENGINE_CTRL_CMD                         0
-#   define ENGINE_F_ENGINE_CTRL_CMD_STRING                  0
-#   define ENGINE_F_ENGINE_FINISH                           0
-#   define ENGINE_F_ENGINE_GET_CIPHER                       0
-#   define ENGINE_F_ENGINE_GET_DIGEST                       0
-#   define ENGINE_F_ENGINE_GET_FIRST                        0
-#   define ENGINE_F_ENGINE_GET_LAST                         0
-#   define ENGINE_F_ENGINE_GET_NEXT                         0
-#   define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH               0
-#   define ENGINE_F_ENGINE_GET_PKEY_METH                    0
-#   define ENGINE_F_ENGINE_GET_PREV                         0
-#   define ENGINE_F_ENGINE_INIT                             0
-#   define ENGINE_F_ENGINE_LIST_ADD                         0
-#   define ENGINE_F_ENGINE_LIST_REMOVE                      0
-#   define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY                 0
-#   define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY                  0
-#   define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT             0
-#   define ENGINE_F_ENGINE_NEW                              0
-#   define ENGINE_F_ENGINE_PKEY_ASN1_FIND_STR               0
-#   define ENGINE_F_ENGINE_REMOVE                           0
-#   define ENGINE_F_ENGINE_SET_DEFAULT_STRING               0
-#   define ENGINE_F_ENGINE_SET_ID                           0
-#   define ENGINE_F_ENGINE_SET_NAME                         0
-#   define ENGINE_F_ENGINE_TABLE_REGISTER                   0
-#   define ENGINE_F_ENGINE_UNLOCKED_FINISH                  0
-#   define ENGINE_F_ENGINE_UP_REF                           0
-#   define ENGINE_F_INT_CLEANUP_ITEM                        0
-#   define ENGINE_F_INT_CTRL_HELPER                         0
-#   define ENGINE_F_INT_ENGINE_CONFIGURE                    0
-#   define ENGINE_F_INT_ENGINE_MODULE_INIT                  0
-#   define ENGINE_F_OSSL_HMAC_INIT                          0
-#  endif
+#define ENGINE_F_DIGEST_UPDATE 0
+#define ENGINE_F_DYNAMIC_CTRL 0
+#define ENGINE_F_DYNAMIC_GET_DATA_CTX 0
+#define ENGINE_F_DYNAMIC_LOAD 0
+#define ENGINE_F_DYNAMIC_SET_DATA_CTX 0
+#define ENGINE_F_ENGINE_ADD 0
+#define ENGINE_F_ENGINE_BY_ID 0
+#define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE 0
+#define ENGINE_F_ENGINE_CTRL 0
+#define ENGINE_F_ENGINE_CTRL_CMD 0
+#define ENGINE_F_ENGINE_CTRL_CMD_STRING 0
+#define ENGINE_F_ENGINE_FINISH 0
+#define ENGINE_F_ENGINE_GET_CIPHER 0
+#define ENGINE_F_ENGINE_GET_DIGEST 0
+#define ENGINE_F_ENGINE_GET_FIRST 0
+#define ENGINE_F_ENGINE_GET_LAST 0
+#define ENGINE_F_ENGINE_GET_NEXT 0
+#define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH 0
+#define ENGINE_F_ENGINE_GET_PKEY_METH 0
+#define ENGINE_F_ENGINE_GET_PREV 0
+#define ENGINE_F_ENGINE_INIT 0
+#define ENGINE_F_ENGINE_LIST_ADD 0
+#define ENGINE_F_ENGINE_LIST_REMOVE 0
+#define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY 0
+#define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY 0
+#define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT 0
+#define ENGINE_F_ENGINE_NEW 0
+#define ENGINE_F_ENGINE_PKEY_ASN1_FIND_STR 0
+#define ENGINE_F_ENGINE_REMOVE 0
+#define ENGINE_F_ENGINE_SET_DEFAULT_STRING 0
+#define ENGINE_F_ENGINE_SET_ID 0
+#define ENGINE_F_ENGINE_SET_NAME 0
+#define ENGINE_F_ENGINE_TABLE_REGISTER 0
+#define ENGINE_F_ENGINE_UNLOCKED_FINISH 0
+#define ENGINE_F_ENGINE_UP_REF 0
+#define ENGINE_F_INT_CLEANUP_ITEM 0
+#define ENGINE_F_INT_CTRL_HELPER 0
+#define ENGINE_F_INT_ENGINE_CONFIGURE 0
+#define ENGINE_F_INT_ENGINE_MODULE_INIT 0
+#define ENGINE_F_OSSL_HMAC_INIT 0
+#endif
 
 /*
  * EVP function codes.
  */
-#  define EVP_F_AESNI_INIT_KEY                             0
-#  define EVP_F_AESNI_XTS_INIT_KEY                         0
-#  define EVP_F_AES_GCM_CTRL                               0
-#  define EVP_F_AES_INIT_KEY                               0
-#  define EVP_F_AES_OCB_CIPHER                             0
-#  define EVP_F_AES_T4_INIT_KEY                            0
-#  define EVP_F_AES_T4_XTS_INIT_KEY                        0
-#  define EVP_F_AES_WRAP_CIPHER                            0
-#  define EVP_F_AES_XTS_INIT_KEY                           0
-#  define EVP_F_ALG_MODULE_INIT                            0
-#  define EVP_F_ARIA_CCM_INIT_KEY                          0
-#  define EVP_F_ARIA_GCM_CTRL                              0
-#  define EVP_F_ARIA_GCM_INIT_KEY                          0
-#  define EVP_F_ARIA_INIT_KEY                              0
-#  define EVP_F_B64_NEW                                    0
-#  define EVP_F_CAMELLIA_INIT_KEY                          0
-#  define EVP_F_CHACHA20_POLY1305_CTRL                     0
-#  define EVP_F_CMLL_T4_INIT_KEY                           0
-#  define EVP_F_DES_EDE3_WRAP_CIPHER                       0
-#  define EVP_F_DO_SIGVER_INIT                             0
-#  define EVP_F_ENC_NEW                                    0
-#  define EVP_F_EVP_CIPHERINIT_EX                          0
-#  define EVP_F_EVP_CIPHER_ASN1_TO_PARAM                   0
-#  define EVP_F_EVP_CIPHER_CTX_COPY                        0
-#  define EVP_F_EVP_CIPHER_CTX_CTRL                        0
-#  define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH              0
-#  define EVP_F_EVP_CIPHER_PARAM_TO_ASN1                   0
-#  define EVP_F_EVP_DECRYPTFINAL_EX                        0
-#  define EVP_F_EVP_DECRYPTUPDATE                          0
-#  define EVP_F_EVP_DIGESTFINALXOF                         0
-#  define EVP_F_EVP_DIGESTINIT_EX                          0
-#  define EVP_F_EVP_ENCRYPTDECRYPTUPDATE                   0
-#  define EVP_F_EVP_ENCRYPTFINAL_EX                        0
-#  define EVP_F_EVP_ENCRYPTUPDATE                          0
-#  define EVP_F_EVP_MD_CTX_COPY_EX                         0
-#  define EVP_F_EVP_MD_SIZE                                0
-#  define EVP_F_EVP_OPENINIT                               0
-#  define EVP_F_EVP_PBE_ALG_ADD                            0
-#  define EVP_F_EVP_PBE_ALG_ADD_TYPE                       0
-#  define EVP_F_EVP_PBE_CIPHERINIT                         0
-#  define EVP_F_EVP_PBE_SCRYPT                             0
-#  define EVP_F_EVP_PKCS82PKEY                             0
-#  define EVP_F_EVP_PKEY2PKCS8                             0
-#  define EVP_F_EVP_PKEY_ASN1_ADD0                         0
-#  define EVP_F_EVP_PKEY_CHECK                             0
-#  define EVP_F_EVP_PKEY_COPY_PARAMETERS                   0
-#  define EVP_F_EVP_PKEY_CTX_CTRL                          0
-#  define EVP_F_EVP_PKEY_CTX_CTRL_STR                      0
-#  define EVP_F_EVP_PKEY_CTX_DUP                           0
-#  define EVP_F_EVP_PKEY_CTX_MD                            0
-#  define EVP_F_EVP_PKEY_DECRYPT                           0
-#  define EVP_F_EVP_PKEY_DECRYPT_INIT                      0
-#  define EVP_F_EVP_PKEY_DECRYPT_OLD                       0
-#  define EVP_F_EVP_PKEY_DERIVE                            0
-#  define EVP_F_EVP_PKEY_DERIVE_INIT                       0
-#  define EVP_F_EVP_PKEY_DERIVE_SET_PEER                   0
-#  define EVP_F_EVP_PKEY_ENCRYPT                           0
-#  define EVP_F_EVP_PKEY_ENCRYPT_INIT                      0
-#  define EVP_F_EVP_PKEY_ENCRYPT_OLD                       0
-#  define EVP_F_EVP_PKEY_GET0_DH                           0
-#  define EVP_F_EVP_PKEY_GET0_DSA                          0
-#  define EVP_F_EVP_PKEY_GET0_EC_KEY                       0
-#  define EVP_F_EVP_PKEY_GET0_HMAC                         0
-#  define EVP_F_EVP_PKEY_GET0_POLY1305                     0
-#  define EVP_F_EVP_PKEY_GET0_RSA                          0
-#  define EVP_F_EVP_PKEY_GET0_SIPHASH                      0
-#  define EVP_F_EVP_PKEY_GET_RAW_PRIVATE_KEY               0
-#  define EVP_F_EVP_PKEY_GET_RAW_PUBLIC_KEY                0
-#  define EVP_F_EVP_PKEY_KEYGEN                            0
-#  define EVP_F_EVP_PKEY_KEYGEN_INIT                       0
-#  define EVP_F_EVP_PKEY_METH_ADD0                         0
-#  define EVP_F_EVP_PKEY_METH_NEW                          0
-#  define EVP_F_EVP_PKEY_NEW                               0
-#  define EVP_F_EVP_PKEY_NEW_CMAC_KEY                      0
-#  define EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY               0
-#  define EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY                0
-#  define EVP_F_EVP_PKEY_PARAMGEN                          0
-#  define EVP_F_EVP_PKEY_PARAMGEN_INIT                     0
-#  define EVP_F_EVP_PKEY_PARAM_CHECK                       0
-#  define EVP_F_EVP_PKEY_PUBLIC_CHECK                      0
-#  define EVP_F_EVP_PKEY_SET1_ENGINE                       0
-#  define EVP_F_EVP_PKEY_SET_ALIAS_TYPE                    0
-#  define EVP_F_EVP_PKEY_SIGN                              0
-#  define EVP_F_EVP_PKEY_SIGN_INIT                         0
-#  define EVP_F_EVP_PKEY_VERIFY                            0
-#  define EVP_F_EVP_PKEY_VERIFY_INIT                       0
-#  define EVP_F_EVP_PKEY_VERIFY_RECOVER                    0
-#  define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT               0
-#  define EVP_F_EVP_SIGNFINAL                              0
-#  define EVP_F_EVP_VERIFYFINAL                            0
-#  define EVP_F_INT_CTX_NEW                                0
-#  define EVP_F_OK_NEW                                     0
-#  define EVP_F_PKCS5_PBE_KEYIVGEN                         0
-#  define EVP_F_PKCS5_V2_PBE_KEYIVGEN                      0
-#  define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN                   0
-#  define EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN                   0
-#  define EVP_F_PKEY_SET_TYPE                              0
-#  define EVP_F_RC2_MAGIC_TO_METH                          0
-#  define EVP_F_RC5_CTRL                                   0
-#  define EVP_F_R_32_12_16_INIT_KEY                        0
-#  define EVP_F_S390X_AES_GCM_CTRL                         0
-#  define EVP_F_UPDATE                                     0
+#define EVP_F_AESNI_INIT_KEY 0
+#define EVP_F_AESNI_XTS_INIT_KEY 0
+#define EVP_F_AES_GCM_CTRL 0
+#define EVP_F_AES_INIT_KEY 0
+#define EVP_F_AES_OCB_CIPHER 0
+#define EVP_F_AES_T4_INIT_KEY 0
+#define EVP_F_AES_T4_XTS_INIT_KEY 0
+#define EVP_F_AES_WRAP_CIPHER 0
+#define EVP_F_AES_XTS_INIT_KEY 0
+#define EVP_F_ALG_MODULE_INIT 0
+#define EVP_F_ARIA_CCM_INIT_KEY 0
+#define EVP_F_ARIA_GCM_CTRL 0
+#define EVP_F_ARIA_GCM_INIT_KEY 0
+#define EVP_F_ARIA_INIT_KEY 0
+#define EVP_F_B64_NEW 0
+#define EVP_F_CAMELLIA_INIT_KEY 0
+#define EVP_F_CHACHA20_POLY1305_CTRL 0
+#define EVP_F_CMLL_T4_INIT_KEY 0
+#define EVP_F_DES_EDE3_WRAP_CIPHER 0
+#define EVP_F_DO_SIGVER_INIT 0
+#define EVP_F_ENC_NEW 0
+#define EVP_F_EVP_CIPHERINIT_EX 0
+#define EVP_F_EVP_CIPHER_ASN1_TO_PARAM 0
+#define EVP_F_EVP_CIPHER_CTX_COPY 0
+#define EVP_F_EVP_CIPHER_CTX_CTRL 0
+#define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH 0
+#define EVP_F_EVP_CIPHER_PARAM_TO_ASN1 0
+#define EVP_F_EVP_DECRYPTFINAL_EX 0
+#define EVP_F_EVP_DECRYPTUPDATE 0
+#define EVP_F_EVP_DIGESTFINALXOF 0
+#define EVP_F_EVP_DIGESTINIT_EX 0
+#define EVP_F_EVP_ENCRYPTDECRYPTUPDATE 0
+#define EVP_F_EVP_ENCRYPTFINAL_EX 0
+#define EVP_F_EVP_ENCRYPTUPDATE 0
+#define EVP_F_EVP_MD_CTX_COPY_EX 0
+#define EVP_F_EVP_MD_SIZE 0
+#define EVP_F_EVP_OPENINIT 0
+#define EVP_F_EVP_PBE_ALG_ADD 0
+#define EVP_F_EVP_PBE_ALG_ADD_TYPE 0
+#define EVP_F_EVP_PBE_CIPHERINIT 0
+#define EVP_F_EVP_PBE_SCRYPT 0
+#define EVP_F_EVP_PKCS82PKEY 0
+#define EVP_F_EVP_PKEY2PKCS8 0
+#define EVP_F_EVP_PKEY_ASN1_ADD0 0
+#define EVP_F_EVP_PKEY_CHECK 0
+#define EVP_F_EVP_PKEY_COPY_PARAMETERS 0
+#define EVP_F_EVP_PKEY_CTX_CTRL 0
+#define EVP_F_EVP_PKEY_CTX_CTRL_STR 0
+#define EVP_F_EVP_PKEY_CTX_DUP 0
+#define EVP_F_EVP_PKEY_CTX_MD 0
+#define EVP_F_EVP_PKEY_DECRYPT 0
+#define EVP_F_EVP_PKEY_DECRYPT_INIT 0
+#define EVP_F_EVP_PKEY_DECRYPT_OLD 0
+#define EVP_F_EVP_PKEY_DERIVE 0
+#define EVP_F_EVP_PKEY_DERIVE_INIT 0
+#define EVP_F_EVP_PKEY_DERIVE_SET_PEER 0
+#define EVP_F_EVP_PKEY_ENCRYPT 0
+#define EVP_F_EVP_PKEY_ENCRYPT_INIT 0
+#define EVP_F_EVP_PKEY_ENCRYPT_OLD 0
+#define EVP_F_EVP_PKEY_GET0_DH 0
+#define EVP_F_EVP_PKEY_GET0_DSA 0
+#define EVP_F_EVP_PKEY_GET0_EC_KEY 0
+#define EVP_F_EVP_PKEY_GET0_HMAC 0
+#define EVP_F_EVP_PKEY_GET0_POLY1305 0
+#define EVP_F_EVP_PKEY_GET0_RSA 0
+#define EVP_F_EVP_PKEY_GET0_SIPHASH 0
+#define EVP_F_EVP_PKEY_GET_RAW_PRIVATE_KEY 0
+#define EVP_F_EVP_PKEY_GET_RAW_PUBLIC_KEY 0
+#define EVP_F_EVP_PKEY_KEYGEN 0
+#define EVP_F_EVP_PKEY_KEYGEN_INIT 0
+#define EVP_F_EVP_PKEY_METH_ADD0 0
+#define EVP_F_EVP_PKEY_METH_NEW 0
+#define EVP_F_EVP_PKEY_NEW 0
+#define EVP_F_EVP_PKEY_NEW_CMAC_KEY 0
+#define EVP_F_EVP_PKEY_NEW_RAW_PRIVATE_KEY 0
+#define EVP_F_EVP_PKEY_NEW_RAW_PUBLIC_KEY 0
+#define EVP_F_EVP_PKEY_PARAMGEN 0
+#define EVP_F_EVP_PKEY_PARAMGEN_INIT 0
+#define EVP_F_EVP_PKEY_PARAM_CHECK 0
+#define EVP_F_EVP_PKEY_PUBLIC_CHECK 0
+#define EVP_F_EVP_PKEY_SET1_ENGINE 0
+#define EVP_F_EVP_PKEY_SET_ALIAS_TYPE 0
+#define EVP_F_EVP_PKEY_SIGN 0
+#define EVP_F_EVP_PKEY_SIGN_INIT 0
+#define EVP_F_EVP_PKEY_VERIFY 0
+#define EVP_F_EVP_PKEY_VERIFY_INIT 0
+#define EVP_F_EVP_PKEY_VERIFY_RECOVER 0
+#define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT 0
+#define EVP_F_EVP_SIGNFINAL 0
+#define EVP_F_EVP_VERIFYFINAL 0
+#define EVP_F_INT_CTX_NEW 0
+#define EVP_F_OK_NEW 0
+#define EVP_F_PKCS5_PBE_KEYIVGEN 0
+#define EVP_F_PKCS5_V2_PBE_KEYIVGEN 0
+#define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN 0
+#define EVP_F_PKCS5_V2_SCRYPT_KEYIVGEN 0
+#define EVP_F_PKEY_SET_TYPE 0
+#define EVP_F_RC2_MAGIC_TO_METH 0
+#define EVP_F_RC5_CTRL 0
+#define EVP_F_R_32_12_16_INIT_KEY 0
+#define EVP_F_S390X_AES_GCM_CTRL 0
+#define EVP_F_UPDATE 0
 
 /*
  * KDF function codes.
  */
-#  define KDF_F_PKEY_HKDF_CTRL_STR                         0
-#  define KDF_F_PKEY_HKDF_DERIVE                           0
-#  define KDF_F_PKEY_HKDF_INIT                             0
-#  define KDF_F_PKEY_SCRYPT_CTRL_STR                       0
-#  define KDF_F_PKEY_SCRYPT_CTRL_UINT64                    0
-#  define KDF_F_PKEY_SCRYPT_DERIVE                         0
-#  define KDF_F_PKEY_SCRYPT_INIT                           0
-#  define KDF_F_PKEY_SCRYPT_SET_MEMBUF                     0
-#  define KDF_F_PKEY_TLS1_PRF_CTRL_STR                     0
-#  define KDF_F_PKEY_TLS1_PRF_DERIVE                       0
-#  define KDF_F_PKEY_TLS1_PRF_INIT                         0
-#  define KDF_F_TLS1_PRF_ALG                               0
+#define KDF_F_PKEY_HKDF_CTRL_STR 0
+#define KDF_F_PKEY_HKDF_DERIVE 0
+#define KDF_F_PKEY_HKDF_INIT 0
+#define KDF_F_PKEY_SCRYPT_CTRL_STR 0
+#define KDF_F_PKEY_SCRYPT_CTRL_UINT64 0
+#define KDF_F_PKEY_SCRYPT_DERIVE 0
+#define KDF_F_PKEY_SCRYPT_INIT 0
+#define KDF_F_PKEY_SCRYPT_SET_MEMBUF 0
+#define KDF_F_PKEY_TLS1_PRF_CTRL_STR 0
+#define KDF_F_PKEY_TLS1_PRF_DERIVE 0
+#define KDF_F_PKEY_TLS1_PRF_INIT 0
+#define KDF_F_TLS1_PRF_ALG 0
 
 /*
  * KDF reason codes.
  */
-#  define KDF_R_INVALID_DIGEST                             0
-#  define KDF_R_MISSING_ITERATION_COUNT                    0
-#  define KDF_R_MISSING_KEY                                0
-#  define KDF_R_MISSING_MESSAGE_DIGEST                     0
-#  define KDF_R_MISSING_PARAMETER                          0
-#  define KDF_R_MISSING_PASS                               0
-#  define KDF_R_MISSING_SALT                               0
-#  define KDF_R_MISSING_SECRET                             0
-#  define KDF_R_MISSING_SEED                               0
-#  define KDF_R_UNKNOWN_PARAMETER_TYPE                     0
-#  define KDF_R_VALUE_ERROR                                0
-#  define KDF_R_VALUE_MISSING                              0
+#define KDF_R_INVALID_DIGEST 0
+#define KDF_R_MISSING_ITERATION_COUNT 0
+#define KDF_R_MISSING_KEY 0
+#define KDF_R_MISSING_MESSAGE_DIGEST 0
+#define KDF_R_MISSING_PARAMETER 0
+#define KDF_R_MISSING_PASS 0
+#define KDF_R_MISSING_SALT 0
+#define KDF_R_MISSING_SECRET 0
+#define KDF_R_MISSING_SEED 0
+#define KDF_R_UNKNOWN_PARAMETER_TYPE 0
+#define KDF_R_VALUE_ERROR 0
+#define KDF_R_VALUE_MISSING 0
 
 /*
  * OBJ function codes.
  */
-#  define OBJ_F_OBJ_ADD_OBJECT                             0
-#  define OBJ_F_OBJ_ADD_SIGID                              0
-#  define OBJ_F_OBJ_CREATE                                 0
-#  define OBJ_F_OBJ_DUP                                    0
-#  define OBJ_F_OBJ_NAME_NEW_INDEX                         0
-#  define OBJ_F_OBJ_NID2LN                                 0
-#  define OBJ_F_OBJ_NID2OBJ                                0
-#  define OBJ_F_OBJ_NID2SN                                 0
-#  define OBJ_F_OBJ_TXT2OBJ                                0
+#define OBJ_F_OBJ_ADD_OBJECT 0
+#define OBJ_F_OBJ_ADD_SIGID 0
+#define OBJ_F_OBJ_CREATE 0
+#define OBJ_F_OBJ_DUP 0
+#define OBJ_F_OBJ_NAME_NEW_INDEX 0
+#define OBJ_F_OBJ_NID2LN 0
+#define OBJ_F_OBJ_NID2OBJ 0
+#define OBJ_F_OBJ_NID2SN 0
+#define OBJ_F_OBJ_TXT2OBJ 0
 
-#  ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 /*
  * OCSP function codes.
  */
-#   define OCSP_F_D2I_OCSP_NONCE                            0
-#   define OCSP_F_OCSP_BASIC_ADD1_STATUS                    0
-#   define OCSP_F_OCSP_BASIC_SIGN                           0
-#   define OCSP_F_OCSP_BASIC_SIGN_CTX                       0
-#   define OCSP_F_OCSP_BASIC_VERIFY                         0
-#   define OCSP_F_OCSP_CERT_ID_NEW                          0
-#   define OCSP_F_OCSP_CHECK_DELEGATED                      0
-#   define OCSP_F_OCSP_CHECK_IDS                            0
-#   define OCSP_F_OCSP_CHECK_ISSUER                         0
-#   define OCSP_F_OCSP_CHECK_VALIDITY                       0
-#   define OCSP_F_OCSP_MATCH_ISSUERID                       0
-#   define OCSP_F_OCSP_PARSE_URL                            0
-#   define OCSP_F_OCSP_REQUEST_SIGN                         0
-#   define OCSP_F_OCSP_REQUEST_VERIFY                       0
-#   define OCSP_F_OCSP_RESPONSE_GET1_BASIC                  0
-#   define OCSP_F_PARSE_HTTP_LINE1                          0
-#  endif
+#define OCSP_F_D2I_OCSP_NONCE 0
+#define OCSP_F_OCSP_BASIC_ADD1_STATUS 0
+#define OCSP_F_OCSP_BASIC_SIGN 0
+#define OCSP_F_OCSP_BASIC_SIGN_CTX 0
+#define OCSP_F_OCSP_BASIC_VERIFY 0
+#define OCSP_F_OCSP_CERT_ID_NEW 0
+#define OCSP_F_OCSP_CHECK_DELEGATED 0
+#define OCSP_F_OCSP_CHECK_IDS 0
+#define OCSP_F_OCSP_CHECK_ISSUER 0
+#define OCSP_F_OCSP_CHECK_VALIDITY 0
+#define OCSP_F_OCSP_MATCH_ISSUERID 0
+#define OCSP_F_OCSP_PARSE_URL 0
+#define OCSP_F_OCSP_REQUEST_SIGN 0
+#define OCSP_F_OCSP_REQUEST_VERIFY 0
+#define OCSP_F_OCSP_RESPONSE_GET1_BASIC 0
+#define OCSP_F_PARSE_HTTP_LINE1 0
+#endif
 
 /*
  * PEM function codes.
  */
-#  define PEM_F_B2I_DSS                                    0
-#  define PEM_F_B2I_PVK_BIO                                0
-#  define PEM_F_B2I_RSA                                    0
-#  define PEM_F_CHECK_BITLEN_DSA                           0
-#  define PEM_F_CHECK_BITLEN_RSA                           0
-#  define PEM_F_D2I_PKCS8PRIVATEKEY_BIO                    0
-#  define PEM_F_D2I_PKCS8PRIVATEKEY_FP                     0
-#  define PEM_F_DO_B2I                                     0
-#  define PEM_F_DO_B2I_BIO                                 0
-#  define PEM_F_DO_BLOB_HEADER                             0
-#  define PEM_F_DO_I2B                                     0
-#  define PEM_F_DO_PK8PKEY                                 0
-#  define PEM_F_DO_PK8PKEY_FP                              0
-#  define PEM_F_DO_PVK_BODY                                0
-#  define PEM_F_DO_PVK_HEADER                              0
-#  define PEM_F_GET_HEADER_AND_DATA                        0
-#  define PEM_F_GET_NAME                                   0
-#  define PEM_F_I2B_PVK                                    0
-#  define PEM_F_I2B_PVK_BIO                                0
-#  define PEM_F_LOAD_IV                                    0
-#  define PEM_F_PEM_ASN1_READ                              0
-#  define PEM_F_PEM_ASN1_READ_BIO                          0
-#  define PEM_F_PEM_ASN1_WRITE                             0
-#  define PEM_F_PEM_ASN1_WRITE_BIO                         0
-#  define PEM_F_PEM_DEF_CALLBACK                           0
-#  define PEM_F_PEM_DO_HEADER                              0
-#  define PEM_F_PEM_GET_EVP_CIPHER_INFO                    0
-#  define PEM_F_PEM_READ                                   0
-#  define PEM_F_PEM_READ_BIO                               0
-#  define PEM_F_PEM_READ_BIO_DHPARAMS                      0
-#  define PEM_F_PEM_READ_BIO_EX                            0
-#  define PEM_F_PEM_READ_BIO_PARAMETERS                    0
-#  define PEM_F_PEM_READ_BIO_PRIVATEKEY                    0
-#  define PEM_F_PEM_READ_DHPARAMS                          0
-#  define PEM_F_PEM_READ_PRIVATEKEY                        0
-#  define PEM_F_PEM_SIGNFINAL                              0
-#  define PEM_F_PEM_WRITE                                  0
-#  define PEM_F_PEM_WRITE_BIO                              0
-#  define PEM_F_PEM_WRITE_BIO_PRIVATEKEY_TRADITIONAL       0
-#  define PEM_F_PEM_WRITE_PRIVATEKEY                       0
-#  define PEM_F_PEM_X509_INFO_READ                         0
-#  define PEM_F_PEM_X509_INFO_READ_BIO                     0
-#  define PEM_F_PEM_X509_INFO_WRITE_BIO                    0
+#define PEM_F_B2I_DSS 0
+#define PEM_F_B2I_PVK_BIO 0
+#define PEM_F_B2I_RSA 0
+#define PEM_F_CHECK_BITLEN_DSA 0
+#define PEM_F_CHECK_BITLEN_RSA 0
+#define PEM_F_D2I_PKCS8PRIVATEKEY_BIO 0
+#define PEM_F_D2I_PKCS8PRIVATEKEY_FP 0
+#define PEM_F_DO_B2I 0
+#define PEM_F_DO_B2I_BIO 0
+#define PEM_F_DO_BLOB_HEADER 0
+#define PEM_F_DO_I2B 0
+#define PEM_F_DO_PK8PKEY 0
+#define PEM_F_DO_PK8PKEY_FP 0
+#define PEM_F_DO_PVK_BODY 0
+#define PEM_F_DO_PVK_HEADER 0
+#define PEM_F_GET_HEADER_AND_DATA 0
+#define PEM_F_GET_NAME 0
+#define PEM_F_I2B_PVK 0
+#define PEM_F_I2B_PVK_BIO 0
+#define PEM_F_LOAD_IV 0
+#define PEM_F_PEM_ASN1_READ 0
+#define PEM_F_PEM_ASN1_READ_BIO 0
+#define PEM_F_PEM_ASN1_WRITE 0
+#define PEM_F_PEM_ASN1_WRITE_BIO 0
+#define PEM_F_PEM_DEF_CALLBACK 0
+#define PEM_F_PEM_DO_HEADER 0
+#define PEM_F_PEM_GET_EVP_CIPHER_INFO 0
+#define PEM_F_PEM_READ 0
+#define PEM_F_PEM_READ_BIO 0
+#define PEM_F_PEM_READ_BIO_DHPARAMS 0
+#define PEM_F_PEM_READ_BIO_EX 0
+#define PEM_F_PEM_READ_BIO_PARAMETERS 0
+#define PEM_F_PEM_READ_BIO_PRIVATEKEY 0
+#define PEM_F_PEM_READ_DHPARAMS 0
+#define PEM_F_PEM_READ_PRIVATEKEY 0
+#define PEM_F_PEM_SIGNFINAL 0
+#define PEM_F_PEM_WRITE 0
+#define PEM_F_PEM_WRITE_BIO 0
+#define PEM_F_PEM_WRITE_BIO_PRIVATEKEY_TRADITIONAL 0
+#define PEM_F_PEM_WRITE_PRIVATEKEY 0
+#define PEM_F_PEM_X509_INFO_READ 0
+#define PEM_F_PEM_X509_INFO_READ_BIO 0
+#define PEM_F_PEM_X509_INFO_WRITE_BIO 0
 
 /*
  * PKCS12 function codes.
  */
-#  define PKCS12_F_OPENSSL_ASC2UNI                         0
-#  define PKCS12_F_OPENSSL_UNI2ASC                         0
-#  define PKCS12_F_OPENSSL_UNI2UTF8                        0
-#  define PKCS12_F_OPENSSL_UTF82UNI                        0
-#  define PKCS12_F_PKCS12_CREATE                           0
-#  define PKCS12_F_PKCS12_GEN_MAC                          0
-#  define PKCS12_F_PKCS12_INIT                             0
-#  define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I                 0
-#  define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT                 0
-#  define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG                0
-#  define PKCS12_F_PKCS12_KEY_GEN_ASC                      0
-#  define PKCS12_F_PKCS12_KEY_GEN_UNI                      0
-#  define PKCS12_F_PKCS12_KEY_GEN_UTF8                     0
-#  define PKCS12_F_PKCS12_NEWPASS                          0
-#  define PKCS12_F_PKCS12_PACK_P7DATA                      0
-#  define PKCS12_F_PKCS12_PACK_P7ENCDATA                   0
-#  define PKCS12_F_PKCS12_PARSE                            0
-#  define PKCS12_F_PKCS12_PBE_CRYPT                        0
-#  define PKCS12_F_PKCS12_PBE_KEYIVGEN                     0
-#  define PKCS12_F_PKCS12_SAFEBAG_CREATE0_P8INF            0
-#  define PKCS12_F_PKCS12_SAFEBAG_CREATE0_PKCS8            0
-#  define PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT     0
-#  define PKCS12_F_PKCS12_SETUP_MAC                        0
-#  define PKCS12_F_PKCS12_SET_MAC                          0
-#  define PKCS12_F_PKCS12_UNPACK_AUTHSAFES                 0
-#  define PKCS12_F_PKCS12_UNPACK_P7DATA                    0
-#  define PKCS12_F_PKCS12_VERIFY_MAC                       0
-#  define PKCS12_F_PKCS8_ENCRYPT                           0
-#  define PKCS12_F_PKCS8_SET0_PBE                          0
+#define PKCS12_F_OPENSSL_ASC2UNI 0
+#define PKCS12_F_OPENSSL_UNI2ASC 0
+#define PKCS12_F_OPENSSL_UNI2UTF8 0
+#define PKCS12_F_OPENSSL_UTF82UNI 0
+#define PKCS12_F_PKCS12_CREATE 0
+#define PKCS12_F_PKCS12_GEN_MAC 0
+#define PKCS12_F_PKCS12_INIT 0
+#define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I 0
+#define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT 0
+#define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG 0
+#define PKCS12_F_PKCS12_KEY_GEN_ASC 0
+#define PKCS12_F_PKCS12_KEY_GEN_UNI 0
+#define PKCS12_F_PKCS12_KEY_GEN_UTF8 0
+#define PKCS12_F_PKCS12_NEWPASS 0
+#define PKCS12_F_PKCS12_PACK_P7DATA 0
+#define PKCS12_F_PKCS12_PACK_P7ENCDATA 0
+#define PKCS12_F_PKCS12_PARSE 0
+#define PKCS12_F_PKCS12_PBE_CRYPT 0
+#define PKCS12_F_PKCS12_PBE_KEYIVGEN 0
+#define PKCS12_F_PKCS12_SAFEBAG_CREATE0_P8INF 0
+#define PKCS12_F_PKCS12_SAFEBAG_CREATE0_PKCS8 0
+#define PKCS12_F_PKCS12_SAFEBAG_CREATE_PKCS8_ENCRYPT 0
+#define PKCS12_F_PKCS12_SETUP_MAC 0
+#define PKCS12_F_PKCS12_SET_MAC 0
+#define PKCS12_F_PKCS12_UNPACK_AUTHSAFES 0
+#define PKCS12_F_PKCS12_UNPACK_P7DATA 0
+#define PKCS12_F_PKCS12_VERIFY_MAC 0
+#define PKCS12_F_PKCS8_ENCRYPT 0
+#define PKCS12_F_PKCS8_SET0_PBE 0
 
 /*
  * PKCS7 function codes.
  */
-#  define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB                   0
-#  define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME           0
-#  define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP                0
-#  define PKCS7_F_PKCS7_ADD_CERTIFICATE                    0
-#  define PKCS7_F_PKCS7_ADD_CRL                            0
-#  define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                 0
-#  define PKCS7_F_PKCS7_ADD_SIGNATURE                      0
-#  define PKCS7_F_PKCS7_ADD_SIGNER                         0
-#  define PKCS7_F_PKCS7_BIO_ADD_DIGEST                     0
-#  define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST               0
-#  define PKCS7_F_PKCS7_CTRL                               0
-#  define PKCS7_F_PKCS7_DATADECODE                         0
-#  define PKCS7_F_PKCS7_DATAFINAL                          0
-#  define PKCS7_F_PKCS7_DATAINIT                           0
-#  define PKCS7_F_PKCS7_DATAVERIFY                         0
-#  define PKCS7_F_PKCS7_DECRYPT                            0
-#  define PKCS7_F_PKCS7_DECRYPT_RINFO                      0
-#  define PKCS7_F_PKCS7_ENCODE_RINFO                       0
-#  define PKCS7_F_PKCS7_ENCRYPT                            0
-#  define PKCS7_F_PKCS7_FINAL                              0
-#  define PKCS7_F_PKCS7_FIND_DIGEST                        0
-#  define PKCS7_F_PKCS7_GET0_SIGNERS                       0
-#  define PKCS7_F_PKCS7_RECIP_INFO_SET                     0
-#  define PKCS7_F_PKCS7_SET_CIPHER                         0
-#  define PKCS7_F_PKCS7_SET_CONTENT                        0
-#  define PKCS7_F_PKCS7_SET_DIGEST                         0
-#  define PKCS7_F_PKCS7_SET_TYPE                           0
-#  define PKCS7_F_PKCS7_SIGN                               0
-#  define PKCS7_F_PKCS7_SIGNATUREVERIFY                    0
-#  define PKCS7_F_PKCS7_SIGNER_INFO_SET                    0
-#  define PKCS7_F_PKCS7_SIGNER_INFO_SIGN                   0
-#  define PKCS7_F_PKCS7_SIGN_ADD_SIGNER                    0
-#  define PKCS7_F_PKCS7_SIMPLE_SMIMECAP                    0
-#  define PKCS7_F_PKCS7_VERIFY                             0
+#define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB 0
+#define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME 0
+#define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP 0
+#define PKCS7_F_PKCS7_ADD_CERTIFICATE 0
+#define PKCS7_F_PKCS7_ADD_CRL 0
+#define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO 0
+#define PKCS7_F_PKCS7_ADD_SIGNATURE 0
+#define PKCS7_F_PKCS7_ADD_SIGNER 0
+#define PKCS7_F_PKCS7_BIO_ADD_DIGEST 0
+#define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST 0
+#define PKCS7_F_PKCS7_CTRL 0
+#define PKCS7_F_PKCS7_DATADECODE 0
+#define PKCS7_F_PKCS7_DATAFINAL 0
+#define PKCS7_F_PKCS7_DATAINIT 0
+#define PKCS7_F_PKCS7_DATAVERIFY 0
+#define PKCS7_F_PKCS7_DECRYPT 0
+#define PKCS7_F_PKCS7_DECRYPT_RINFO 0
+#define PKCS7_F_PKCS7_ENCODE_RINFO 0
+#define PKCS7_F_PKCS7_ENCRYPT 0
+#define PKCS7_F_PKCS7_FINAL 0
+#define PKCS7_F_PKCS7_FIND_DIGEST 0
+#define PKCS7_F_PKCS7_GET0_SIGNERS 0
+#define PKCS7_F_PKCS7_RECIP_INFO_SET 0
+#define PKCS7_F_PKCS7_SET_CIPHER 0
+#define PKCS7_F_PKCS7_SET_CONTENT 0
+#define PKCS7_F_PKCS7_SET_DIGEST 0
+#define PKCS7_F_PKCS7_SET_TYPE 0
+#define PKCS7_F_PKCS7_SIGN 0
+#define PKCS7_F_PKCS7_SIGNATUREVERIFY 0
+#define PKCS7_F_PKCS7_SIGNER_INFO_SET 0
+#define PKCS7_F_PKCS7_SIGNER_INFO_SIGN 0
+#define PKCS7_F_PKCS7_SIGN_ADD_SIGNER 0
+#define PKCS7_F_PKCS7_SIMPLE_SMIMECAP 0
+#define PKCS7_F_PKCS7_VERIFY 0
 
 /*
  * RAND function codes.
  */
-#  define RAND_F_DATA_COLLECT_METHOD                       0
-#  define RAND_F_DRBG_BYTES                                0
-#  define RAND_F_DRBG_GET_ENTROPY                          0
-#  define RAND_F_DRBG_SETUP                                0
-#  define RAND_F_GET_ENTROPY                               0
-#  define RAND_F_RAND_BYTES                                0
-#  define RAND_F_RAND_DRBG_ENABLE_LOCKING                  0
-#  define RAND_F_RAND_DRBG_GENERATE                        0
-#  define RAND_F_RAND_DRBG_GET_ENTROPY                     0
-#  define RAND_F_RAND_DRBG_GET_NONCE                       0
-#  define RAND_F_RAND_DRBG_INSTANTIATE                     0
-#  define RAND_F_RAND_DRBG_NEW                             0
-#  define RAND_F_RAND_DRBG_RESEED                          0
-#  define RAND_F_RAND_DRBG_RESTART                         0
-#  define RAND_F_RAND_DRBG_SET                             0
-#  define RAND_F_RAND_DRBG_SET_DEFAULTS                    0
-#  define RAND_F_RAND_DRBG_UNINSTANTIATE                   0
-#  define RAND_F_RAND_LOAD_FILE                            0
-#  define RAND_F_RAND_POOL_ACQUIRE_ENTROPY                 0
-#  define RAND_F_RAND_POOL_ADD                             0
-#  define RAND_F_RAND_POOL_ADD_BEGIN                       0
-#  define RAND_F_RAND_POOL_ADD_END                         0
-#  define RAND_F_RAND_POOL_ATTACH                          0
-#  define RAND_F_RAND_POOL_BYTES_NEEDED                    0
-#  define RAND_F_RAND_POOL_GROW                            0
-#  define RAND_F_RAND_POOL_NEW                             0
-#  define RAND_F_RAND_PSEUDO_BYTES                         0
-#  define RAND_F_RAND_WRITE_FILE                           0
+#define RAND_F_DATA_COLLECT_METHOD 0
+#define RAND_F_DRBG_BYTES 0
+#define RAND_F_DRBG_GET_ENTROPY 0
+#define RAND_F_DRBG_SETUP 0
+#define RAND_F_GET_ENTROPY 0
+#define RAND_F_RAND_BYTES 0
+#define RAND_F_RAND_DRBG_ENABLE_LOCKING 0
+#define RAND_F_RAND_DRBG_GENERATE 0
+#define RAND_F_RAND_DRBG_GET_ENTROPY 0
+#define RAND_F_RAND_DRBG_GET_NONCE 0
+#define RAND_F_RAND_DRBG_INSTANTIATE 0
+#define RAND_F_RAND_DRBG_NEW 0
+#define RAND_F_RAND_DRBG_RESEED 0
+#define RAND_F_RAND_DRBG_RESTART 0
+#define RAND_F_RAND_DRBG_SET 0
+#define RAND_F_RAND_DRBG_SET_DEFAULTS 0
+#define RAND_F_RAND_DRBG_UNINSTANTIATE 0
+#define RAND_F_RAND_LOAD_FILE 0
+#define RAND_F_RAND_POOL_ACQUIRE_ENTROPY 0
+#define RAND_F_RAND_POOL_ADD 0
+#define RAND_F_RAND_POOL_ADD_BEGIN 0
+#define RAND_F_RAND_POOL_ADD_END 0
+#define RAND_F_RAND_POOL_ATTACH 0
+#define RAND_F_RAND_POOL_BYTES_NEEDED 0
+#define RAND_F_RAND_POOL_GROW 0
+#define RAND_F_RAND_POOL_NEW 0
+#define RAND_F_RAND_PSEUDO_BYTES 0
+#define RAND_F_RAND_WRITE_FILE 0
 
 /*
  * RSA function codes.
  */
-#  define RSA_F_CHECK_PADDING_MD                           0
-#  define RSA_F_ENCODE_PKCS1                               0
-#  define RSA_F_INT_RSA_VERIFY                             0
-#  define RSA_F_OLD_RSA_PRIV_DECODE                        0
-#  define RSA_F_PKEY_PSS_INIT                              0
-#  define RSA_F_PKEY_RSA_CTRL                              0
-#  define RSA_F_PKEY_RSA_CTRL_STR                          0
-#  define RSA_F_PKEY_RSA_SIGN                              0
-#  define RSA_F_PKEY_RSA_VERIFY                            0
-#  define RSA_F_PKEY_RSA_VERIFYRECOVER                     0
-#  define RSA_F_RSA_ALGOR_TO_MD                            0
-#  define RSA_F_RSA_BUILTIN_KEYGEN                         0
-#  define RSA_F_RSA_CHECK_KEY                              0
-#  define RSA_F_RSA_CHECK_KEY_EX                           0
-#  define RSA_F_RSA_CMS_DECRYPT                            0
-#  define RSA_F_RSA_CMS_VERIFY                             0
-#  define RSA_F_RSA_ITEM_VERIFY                            0
-#  define RSA_F_RSA_METH_DUP                               0
-#  define RSA_F_RSA_METH_NEW                               0
-#  define RSA_F_RSA_METH_SET1_NAME                         0
-#  define RSA_F_RSA_MGF1_TO_MD                             0
-#  define RSA_F_RSA_MULTIP_INFO_NEW                        0
-#  define RSA_F_RSA_NEW_METHOD                             0
-#  define RSA_F_RSA_NULL                                   0
-#  define RSA_F_RSA_NULL_PRIVATE_DECRYPT                   0
-#  define RSA_F_RSA_NULL_PRIVATE_ENCRYPT                   0
-#  define RSA_F_RSA_NULL_PUBLIC_DECRYPT                    0
-#  define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                    0
-#  define RSA_F_RSA_OSSL_PRIVATE_DECRYPT                   0
-#  define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT                   0
-#  define RSA_F_RSA_OSSL_PUBLIC_DECRYPT                    0
-#  define RSA_F_RSA_OSSL_PUBLIC_ENCRYPT                    0
-#  define RSA_F_RSA_PADDING_ADD_NONE                       0
-#  define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 0
-#  define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1            0
-#  define RSA_F_RSA_PADDING_ADD_PKCS1_PSS                  0
-#  define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1             0
-#  define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               0
-#  define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               0
-#  define RSA_F_RSA_PADDING_ADD_SSLV23                     0
-#  define RSA_F_RSA_PADDING_ADD_X931                       0
-#  define RSA_F_RSA_PADDING_CHECK_NONE                     0
-#  define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP               0
-#  define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1          0
-#  define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             0
-#  define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             0
-#  define RSA_F_RSA_PADDING_CHECK_SSLV23                   0
-#  define RSA_F_RSA_PADDING_CHECK_X931                     0
-#  define RSA_F_RSA_PARAM_DECODE                           0
-#  define RSA_F_RSA_PRINT                                  0
-#  define RSA_F_RSA_PRINT_FP                               0
-#  define RSA_F_RSA_PRIV_DECODE                            0
-#  define RSA_F_RSA_PRIV_ENCODE                            0
-#  define RSA_F_RSA_PSS_GET_PARAM                          0
-#  define RSA_F_RSA_PSS_TO_CTX                             0
-#  define RSA_F_RSA_PUB_DECODE                             0
-#  define RSA_F_RSA_SETUP_BLINDING                         0
-#  define RSA_F_RSA_SIGN                                   0
-#  define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 0
-#  define RSA_F_RSA_VERIFY                                 0
-#  define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               0
-#  define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1                  0
-#  define RSA_F_SETUP_TBUF                                 0
+#define RSA_F_CHECK_PADDING_MD 0
+#define RSA_F_ENCODE_PKCS1 0
+#define RSA_F_INT_RSA_VERIFY 0
+#define RSA_F_OLD_RSA_PRIV_DECODE 0
+#define RSA_F_PKEY_PSS_INIT 0
+#define RSA_F_PKEY_RSA_CTRL 0
+#define RSA_F_PKEY_RSA_CTRL_STR 0
+#define RSA_F_PKEY_RSA_SIGN 0
+#define RSA_F_PKEY_RSA_VERIFY 0
+#define RSA_F_PKEY_RSA_VERIFYRECOVER 0
+#define RSA_F_RSA_ALGOR_TO_MD 0
+#define RSA_F_RSA_BUILTIN_KEYGEN 0
+#define RSA_F_RSA_CHECK_KEY 0
+#define RSA_F_RSA_CHECK_KEY_EX 0
+#define RSA_F_RSA_CMS_DECRYPT 0
+#define RSA_F_RSA_CMS_VERIFY 0
+#define RSA_F_RSA_ITEM_VERIFY 0
+#define RSA_F_RSA_METH_DUP 0
+#define RSA_F_RSA_METH_NEW 0
+#define RSA_F_RSA_METH_SET1_NAME 0
+#define RSA_F_RSA_MGF1_TO_MD 0
+#define RSA_F_RSA_MULTIP_INFO_NEW 0
+#define RSA_F_RSA_NEW_METHOD 0
+#define RSA_F_RSA_NULL 0
+#define RSA_F_RSA_NULL_PRIVATE_DECRYPT 0
+#define RSA_F_RSA_NULL_PRIVATE_ENCRYPT 0
+#define RSA_F_RSA_NULL_PUBLIC_DECRYPT 0
+#define RSA_F_RSA_NULL_PUBLIC_ENCRYPT 0
+#define RSA_F_RSA_OSSL_PRIVATE_DECRYPT 0
+#define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT 0
+#define RSA_F_RSA_OSSL_PUBLIC_DECRYPT 0
+#define RSA_F_RSA_OSSL_PUBLIC_ENCRYPT 0
+#define RSA_F_RSA_PADDING_ADD_NONE 0
+#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP 0
+#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP_MGF1 0
+#define RSA_F_RSA_PADDING_ADD_PKCS1_PSS 0
+#define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1 0
+#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1 0
+#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2 0
+#define RSA_F_RSA_PADDING_ADD_SSLV23 0
+#define RSA_F_RSA_PADDING_ADD_X931 0
+#define RSA_F_RSA_PADDING_CHECK_NONE 0
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP 0
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP_MGF1 0
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1 0
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2 0
+#define RSA_F_RSA_PADDING_CHECK_SSLV23 0
+#define RSA_F_RSA_PADDING_CHECK_X931 0
+#define RSA_F_RSA_PARAM_DECODE 0
+#define RSA_F_RSA_PRINT 0
+#define RSA_F_RSA_PRINT_FP 0
+#define RSA_F_RSA_PRIV_DECODE 0
+#define RSA_F_RSA_PRIV_ENCODE 0
+#define RSA_F_RSA_PSS_GET_PARAM 0
+#define RSA_F_RSA_PSS_TO_CTX 0
+#define RSA_F_RSA_PUB_DECODE 0
+#define RSA_F_RSA_SETUP_BLINDING 0
+#define RSA_F_RSA_SIGN 0
+#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING 0
+#define RSA_F_RSA_VERIFY 0
+#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING 0
+#define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1 0
+#define RSA_F_SETUP_TBUF 0
 
 /*
  * OSSL_STORE function codes.
  */
-#  define OSSL_STORE_F_FILE_CTRL                           0
-#  define OSSL_STORE_F_FILE_FIND                           0
-#  define OSSL_STORE_F_FILE_GET_PASS                       0
-#  define OSSL_STORE_F_FILE_LOAD                           0
-#  define OSSL_STORE_F_FILE_LOAD_TRY_DECODE                0
-#  define OSSL_STORE_F_FILE_NAME_TO_URI                    0
-#  define OSSL_STORE_F_FILE_OPEN                           0
-#  define OSSL_STORE_F_OSSL_STORE_ATTACH_PEM_BIO           0
-#  define OSSL_STORE_F_OSSL_STORE_EXPECT                   0
-#  define OSSL_STORE_F_OSSL_STORE_FILE_ATTACH_PEM_BIO_INT  0
-#  define OSSL_STORE_F_OSSL_STORE_FIND                     0
-#  define OSSL_STORE_F_OSSL_STORE_GET0_LOADER_INT          0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_GET1_CERT           0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_GET1_CRL            0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_GET1_NAME           0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_GET1_NAME_DESCRIPTION 0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_GET1_PARAMS         0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_GET1_PKEY           0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_NEW_CERT            0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_NEW_CRL             0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_NEW_EMBEDDED        0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_NEW_NAME            0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_NEW_PARAMS          0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_NEW_PKEY            0
-#  define OSSL_STORE_F_OSSL_STORE_INFO_SET0_NAME_DESCRIPTION 0
-#  define OSSL_STORE_F_OSSL_STORE_INIT_ONCE                0
-#  define OSSL_STORE_F_OSSL_STORE_LOADER_NEW               0
-#  define OSSL_STORE_F_OSSL_STORE_OPEN                     0
-#  define OSSL_STORE_F_OSSL_STORE_OPEN_INT                 0
-#  define OSSL_STORE_F_OSSL_STORE_REGISTER_LOADER_INT      0
-#  define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_ALIAS          0
-#  define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_ISSUER_SERIAL  0
-#  define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT 0
-#  define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_NAME           0
-#  define OSSL_STORE_F_OSSL_STORE_UNREGISTER_LOADER_INT    0
-#  define OSSL_STORE_F_TRY_DECODE_PARAMS                   0
-#  define OSSL_STORE_F_TRY_DECODE_PKCS12                   0
-#  define OSSL_STORE_F_TRY_DECODE_PKCS8ENCRYPTED           0
+#define OSSL_STORE_F_FILE_CTRL 0
+#define OSSL_STORE_F_FILE_FIND 0
+#define OSSL_STORE_F_FILE_GET_PASS 0
+#define OSSL_STORE_F_FILE_LOAD 0
+#define OSSL_STORE_F_FILE_LOAD_TRY_DECODE 0
+#define OSSL_STORE_F_FILE_NAME_TO_URI 0
+#define OSSL_STORE_F_FILE_OPEN 0
+#define OSSL_STORE_F_OSSL_STORE_ATTACH_PEM_BIO 0
+#define OSSL_STORE_F_OSSL_STORE_EXPECT 0
+#define OSSL_STORE_F_OSSL_STORE_FILE_ATTACH_PEM_BIO_INT 0
+#define OSSL_STORE_F_OSSL_STORE_FIND 0
+#define OSSL_STORE_F_OSSL_STORE_GET0_LOADER_INT 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_GET1_CERT 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_GET1_CRL 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_GET1_NAME 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_GET1_NAME_DESCRIPTION 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_GET1_PARAMS 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_GET1_PKEY 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_NEW_CERT 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_NEW_CRL 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_NEW_EMBEDDED 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_NEW_NAME 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_NEW_PARAMS 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_NEW_PKEY 0
+#define OSSL_STORE_F_OSSL_STORE_INFO_SET0_NAME_DESCRIPTION 0
+#define OSSL_STORE_F_OSSL_STORE_INIT_ONCE 0
+#define OSSL_STORE_F_OSSL_STORE_LOADER_NEW 0
+#define OSSL_STORE_F_OSSL_STORE_OPEN 0
+#define OSSL_STORE_F_OSSL_STORE_OPEN_INT 0
+#define OSSL_STORE_F_OSSL_STORE_REGISTER_LOADER_INT 0
+#define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_ALIAS 0
+#define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_ISSUER_SERIAL 0
+#define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT 0
+#define OSSL_STORE_F_OSSL_STORE_SEARCH_BY_NAME 0
+#define OSSL_STORE_F_OSSL_STORE_UNREGISTER_LOADER_INT 0
+#define OSSL_STORE_F_TRY_DECODE_PARAMS 0
+#define OSSL_STORE_F_TRY_DECODE_PKCS12 0
+#define OSSL_STORE_F_TRY_DECODE_PKCS8ENCRYPTED 0
 
-#  ifndef OPENSSL_NO_TS
+#ifndef OPENSSL_NO_TS
 /*
  * TS function codes.
  */
-#   define TS_F_DEF_SERIAL_CB                               0
-#   define TS_F_DEF_TIME_CB                                 0
-#   define TS_F_ESS_ADD_SIGNING_CERT                        0
-#   define TS_F_ESS_ADD_SIGNING_CERT_V2                     0
-#   define TS_F_ESS_CERT_ID_NEW_INIT                        0
-#   define TS_F_ESS_CERT_ID_V2_NEW_INIT                     0
-#   define TS_F_ESS_SIGNING_CERT_NEW_INIT                   0
-#   define TS_F_ESS_SIGNING_CERT_V2_NEW_INIT                0
-#   define TS_F_INT_TS_RESP_VERIFY_TOKEN                    0
-#   define TS_F_PKCS7_TO_TS_TST_INFO                        0
-#   define TS_F_TS_ACCURACY_SET_MICROS                      0
-#   define TS_F_TS_ACCURACY_SET_MILLIS                      0
-#   define TS_F_TS_ACCURACY_SET_SECONDS                     0
-#   define TS_F_TS_CHECK_IMPRINTS                           0
-#   define TS_F_TS_CHECK_NONCES                             0
-#   define TS_F_TS_CHECK_POLICY                             0
-#   define TS_F_TS_CHECK_SIGNING_CERTS                      0
-#   define TS_F_TS_CHECK_STATUS_INFO                        0
-#   define TS_F_TS_COMPUTE_IMPRINT                          0
-#   define TS_F_TS_CONF_INVALID                             0
-#   define TS_F_TS_CONF_LOAD_CERT                           0
-#   define TS_F_TS_CONF_LOAD_CERTS                          0
-#   define TS_F_TS_CONF_LOAD_KEY                            0
-#   define TS_F_TS_CONF_LOOKUP_FAIL                         0
-#   define TS_F_TS_CONF_SET_DEFAULT_ENGINE                  0
-#   define TS_F_TS_GET_STATUS_TEXT                          0
-#   define TS_F_TS_MSG_IMPRINT_SET_ALGO                     0
-#   define TS_F_TS_REQ_SET_MSG_IMPRINT                      0
-#   define TS_F_TS_REQ_SET_NONCE                            0
-#   define TS_F_TS_REQ_SET_POLICY_ID                        0
-#   define TS_F_TS_RESP_CREATE_RESPONSE                     0
-#   define TS_F_TS_RESP_CREATE_TST_INFO                     0
-#   define TS_F_TS_RESP_CTX_ADD_FAILURE_INFO                0
-#   define TS_F_TS_RESP_CTX_ADD_MD                          0
-#   define TS_F_TS_RESP_CTX_ADD_POLICY                      0
-#   define TS_F_TS_RESP_CTX_NEW                             0
-#   define TS_F_TS_RESP_CTX_SET_ACCURACY                    0
-#   define TS_F_TS_RESP_CTX_SET_CERTS                       0
-#   define TS_F_TS_RESP_CTX_SET_DEF_POLICY                  0
-#   define TS_F_TS_RESP_CTX_SET_SIGNER_CERT                 0
-#   define TS_F_TS_RESP_CTX_SET_STATUS_INFO                 0
-#   define TS_F_TS_RESP_GET_POLICY                          0
-#   define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION          0
-#   define TS_F_TS_RESP_SET_STATUS_INFO                     0
-#   define TS_F_TS_RESP_SET_TST_INFO                        0
-#   define TS_F_TS_RESP_SIGN                                0
-#   define TS_F_TS_RESP_VERIFY_SIGNATURE                    0
-#   define TS_F_TS_TST_INFO_SET_ACCURACY                    0
-#   define TS_F_TS_TST_INFO_SET_MSG_IMPRINT                 0
-#   define TS_F_TS_TST_INFO_SET_NONCE                       0
-#   define TS_F_TS_TST_INFO_SET_POLICY_ID                   0
-#   define TS_F_TS_TST_INFO_SET_SERIAL                      0
-#   define TS_F_TS_TST_INFO_SET_TIME                        0
-#   define TS_F_TS_TST_INFO_SET_TSA                         0
-#   define TS_F_TS_VERIFY                                   0
-#   define TS_F_TS_VERIFY_CERT                              0
-#   define TS_F_TS_VERIFY_CTX_NEW                           0
-#  endif
+#define TS_F_DEF_SERIAL_CB 0
+#define TS_F_DEF_TIME_CB 0
+#define TS_F_ESS_ADD_SIGNING_CERT 0
+#define TS_F_ESS_ADD_SIGNING_CERT_V2 0
+#define TS_F_ESS_CERT_ID_NEW_INIT 0
+#define TS_F_ESS_CERT_ID_V2_NEW_INIT 0
+#define TS_F_ESS_SIGNING_CERT_NEW_INIT 0
+#define TS_F_ESS_SIGNING_CERT_V2_NEW_INIT 0
+#define TS_F_INT_TS_RESP_VERIFY_TOKEN 0
+#define TS_F_PKCS7_TO_TS_TST_INFO 0
+#define TS_F_TS_ACCURACY_SET_MICROS 0
+#define TS_F_TS_ACCURACY_SET_MILLIS 0
+#define TS_F_TS_ACCURACY_SET_SECONDS 0
+#define TS_F_TS_CHECK_IMPRINTS 0
+#define TS_F_TS_CHECK_NONCES 0
+#define TS_F_TS_CHECK_POLICY 0
+#define TS_F_TS_CHECK_SIGNING_CERTS 0
+#define TS_F_TS_CHECK_STATUS_INFO 0
+#define TS_F_TS_COMPUTE_IMPRINT 0
+#define TS_F_TS_CONF_INVALID 0
+#define TS_F_TS_CONF_LOAD_CERT 0
+#define TS_F_TS_CONF_LOAD_CERTS 0
+#define TS_F_TS_CONF_LOAD_KEY 0
+#define TS_F_TS_CONF_LOOKUP_FAIL 0
+#define TS_F_TS_CONF_SET_DEFAULT_ENGINE 0
+#define TS_F_TS_GET_STATUS_TEXT 0
+#define TS_F_TS_MSG_IMPRINT_SET_ALGO 0
+#define TS_F_TS_REQ_SET_MSG_IMPRINT 0
+#define TS_F_TS_REQ_SET_NONCE 0
+#define TS_F_TS_REQ_SET_POLICY_ID 0
+#define TS_F_TS_RESP_CREATE_RESPONSE 0
+#define TS_F_TS_RESP_CREATE_TST_INFO 0
+#define TS_F_TS_RESP_CTX_ADD_FAILURE_INFO 0
+#define TS_F_TS_RESP_CTX_ADD_MD 0
+#define TS_F_TS_RESP_CTX_ADD_POLICY 0
+#define TS_F_TS_RESP_CTX_NEW 0
+#define TS_F_TS_RESP_CTX_SET_ACCURACY 0
+#define TS_F_TS_RESP_CTX_SET_CERTS 0
+#define TS_F_TS_RESP_CTX_SET_DEF_POLICY 0
+#define TS_F_TS_RESP_CTX_SET_SIGNER_CERT 0
+#define TS_F_TS_RESP_CTX_SET_STATUS_INFO 0
+#define TS_F_TS_RESP_GET_POLICY 0
+#define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION 0
+#define TS_F_TS_RESP_SET_STATUS_INFO 0
+#define TS_F_TS_RESP_SET_TST_INFO 0
+#define TS_F_TS_RESP_SIGN 0
+#define TS_F_TS_RESP_VERIFY_SIGNATURE 0
+#define TS_F_TS_TST_INFO_SET_ACCURACY 0
+#define TS_F_TS_TST_INFO_SET_MSG_IMPRINT 0
+#define TS_F_TS_TST_INFO_SET_NONCE 0
+#define TS_F_TS_TST_INFO_SET_POLICY_ID 0
+#define TS_F_TS_TST_INFO_SET_SERIAL 0
+#define TS_F_TS_TST_INFO_SET_TIME 0
+#define TS_F_TS_TST_INFO_SET_TSA 0
+#define TS_F_TS_VERIFY 0
+#define TS_F_TS_VERIFY_CERT 0
+#define TS_F_TS_VERIFY_CTX_NEW 0
+#endif
 
 /*
  * UI function codes.
  */
-#  define UI_F_CLOSE_CONSOLE                               0
-#  define UI_F_ECHO_CONSOLE                                0
-#  define UI_F_GENERAL_ALLOCATE_BOOLEAN                    0
-#  define UI_F_GENERAL_ALLOCATE_PROMPT                     0
-#  define UI_F_NOECHO_CONSOLE                              0
-#  define UI_F_OPEN_CONSOLE                                0
-#  define UI_F_UI_CONSTRUCT_PROMPT                         0
-#  define UI_F_UI_CREATE_METHOD                            0
-#  define UI_F_UI_CTRL                                     0
-#  define UI_F_UI_DUP_ERROR_STRING                         0
-#  define UI_F_UI_DUP_INFO_STRING                          0
-#  define UI_F_UI_DUP_INPUT_BOOLEAN                        0
-#  define UI_F_UI_DUP_INPUT_STRING                         0
-#  define UI_F_UI_DUP_USER_DATA                            0
-#  define UI_F_UI_DUP_VERIFY_STRING                        0
-#  define UI_F_UI_GET0_RESULT                              0
-#  define UI_F_UI_GET_RESULT_LENGTH                        0
-#  define UI_F_UI_NEW_METHOD                               0
-#  define UI_F_UI_PROCESS                                  0
-#  define UI_F_UI_SET_RESULT                               0
-#  define UI_F_UI_SET_RESULT_EX                            0
+#define UI_F_CLOSE_CONSOLE 0
+#define UI_F_ECHO_CONSOLE 0
+#define UI_F_GENERAL_ALLOCATE_BOOLEAN 0
+#define UI_F_GENERAL_ALLOCATE_PROMPT 0
+#define UI_F_NOECHO_CONSOLE 0
+#define UI_F_OPEN_CONSOLE 0
+#define UI_F_UI_CONSTRUCT_PROMPT 0
+#define UI_F_UI_CREATE_METHOD 0
+#define UI_F_UI_CTRL 0
+#define UI_F_UI_DUP_ERROR_STRING 0
+#define UI_F_UI_DUP_INFO_STRING 0
+#define UI_F_UI_DUP_INPUT_BOOLEAN 0
+#define UI_F_UI_DUP_INPUT_STRING 0
+#define UI_F_UI_DUP_USER_DATA 0
+#define UI_F_UI_DUP_VERIFY_STRING 0
+#define UI_F_UI_GET0_RESULT 0
+#define UI_F_UI_GET_RESULT_LENGTH 0
+#define UI_F_UI_NEW_METHOD 0
+#define UI_F_UI_PROCESS 0
+#define UI_F_UI_SET_RESULT 0
+#define UI_F_UI_SET_RESULT_EX 0
 
 /*
  * X509 function codes.
  */
-#  define X509_F_ADD_CERT_DIR                              0
-#  define X509_F_BUILD_CHAIN                               0
-#  define X509_F_BY_FILE_CTRL                              0
-#  define X509_F_CHECK_NAME_CONSTRAINTS                    0
-#  define X509_F_CHECK_POLICY                              0
-#  define X509_F_DANE_I2D                                  0
-#  define X509_F_DIR_CTRL                                  0
-#  define X509_F_GET_CERT_BY_SUBJECT                       0
-#  define X509_F_I2D_X509_AUX                              0
-#  define X509_F_LOOKUP_CERTS_SK                           0
-#  define X509_F_NETSCAPE_SPKI_B64_DECODE                  0
-#  define X509_F_NETSCAPE_SPKI_B64_ENCODE                  0
-#  define X509_F_NEW_DIR                                   0
-#  define X509_F_X509AT_ADD1_ATTR                          0
-#  define X509_F_X509V3_ADD_EXT                            0
-#  define X509_F_X509_ATTRIBUTE_CREATE_BY_NID              0
-#  define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ              0
-#  define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT              0
-#  define X509_F_X509_ATTRIBUTE_GET0_DATA                  0
-#  define X509_F_X509_ATTRIBUTE_SET1_DATA                  0
-#  define X509_F_X509_CHECK_PRIVATE_KEY                    0
-#  define X509_F_X509_CRL_DIFF                             0
-#  define X509_F_X509_CRL_METHOD_NEW                       0
-#  define X509_F_X509_CRL_PRINT_FP                         0
-#  define X509_F_X509_EXTENSION_CREATE_BY_NID              0
-#  define X509_F_X509_EXTENSION_CREATE_BY_OBJ              0
-#  define X509_F_X509_GET_PUBKEY_PARAMETERS                0
-#  define X509_F_X509_LOAD_CERT_CRL_FILE                   0
-#  define X509_F_X509_LOAD_CERT_FILE                       0
-#  define X509_F_X509_LOAD_CRL_FILE                        0
-#  define X509_F_X509_LOOKUP_METH_NEW                      0
-#  define X509_F_X509_LOOKUP_NEW                           0
-#  define X509_F_X509_NAME_ADD_ENTRY                       0
-#  define X509_F_X509_NAME_CANON                           0
-#  define X509_F_X509_NAME_ENTRY_CREATE_BY_NID             0
-#  define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT             0
-#  define X509_F_X509_NAME_ENTRY_SET_OBJECT                0
-#  define X509_F_X509_NAME_ONELINE                         0
-#  define X509_F_X509_NAME_PRINT                           0
-#  define X509_F_X509_OBJECT_NEW                           0
-#  define X509_F_X509_PRINT_EX_FP                          0
-#  define X509_F_X509_PUBKEY_DECODE                        0
-#  define X509_F_X509_PUBKEY_GET                           0
-#  define X509_F_X509_PUBKEY_GET0                          0
-#  define X509_F_X509_PUBKEY_SET                           0
-#  define X509_F_X509_REQ_CHECK_PRIVATE_KEY                0
-#  define X509_F_X509_REQ_PRINT_EX                         0
-#  define X509_F_X509_REQ_PRINT_FP                         0
-#  define X509_F_X509_REQ_TO_X509                          0
-#  define X509_F_X509_STORE_ADD_CERT                       0
-#  define X509_F_X509_STORE_ADD_CRL                        0
-#  define X509_F_X509_STORE_ADD_LOOKUP                     0
-#  define X509_F_X509_STORE_CTX_GET1_ISSUER                0
-#  define X509_F_X509_STORE_CTX_INIT                       0
-#  define X509_F_X509_STORE_CTX_NEW                        0
-#  define X509_F_X509_STORE_CTX_PURPOSE_INHERIT            0
-#  define X509_F_X509_STORE_NEW                            0
-#  define X509_F_X509_TO_X509_REQ                          0
-#  define X509_F_X509_TRUST_ADD                            0
-#  define X509_F_X509_TRUST_SET                            0
-#  define X509_F_X509_VERIFY_CERT                          0
-#  define X509_F_X509_VERIFY_PARAM_NEW                     0
+#define X509_F_ADD_CERT_DIR 0
+#define X509_F_BUILD_CHAIN 0
+#define X509_F_BY_FILE_CTRL 0
+#define X509_F_CHECK_NAME_CONSTRAINTS 0
+#define X509_F_CHECK_POLICY 0
+#define X509_F_DANE_I2D 0
+#define X509_F_DIR_CTRL 0
+#define X509_F_GET_CERT_BY_SUBJECT 0
+#define X509_F_I2D_X509_AUX 0
+#define X509_F_LOOKUP_CERTS_SK 0
+#define X509_F_NETSCAPE_SPKI_B64_DECODE 0
+#define X509_F_NETSCAPE_SPKI_B64_ENCODE 0
+#define X509_F_NEW_DIR 0
+#define X509_F_X509AT_ADD1_ATTR 0
+#define X509_F_X509V3_ADD_EXT 0
+#define X509_F_X509_ATTRIBUTE_CREATE_BY_NID 0
+#define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ 0
+#define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT 0
+#define X509_F_X509_ATTRIBUTE_GET0_DATA 0
+#define X509_F_X509_ATTRIBUTE_SET1_DATA 0
+#define X509_F_X509_CHECK_PRIVATE_KEY 0
+#define X509_F_X509_CRL_DIFF 0
+#define X509_F_X509_CRL_METHOD_NEW 0
+#define X509_F_X509_CRL_PRINT_FP 0
+#define X509_F_X509_EXTENSION_CREATE_BY_NID 0
+#define X509_F_X509_EXTENSION_CREATE_BY_OBJ 0
+#define X509_F_X509_GET_PUBKEY_PARAMETERS 0
+#define X509_F_X509_LOAD_CERT_CRL_FILE 0
+#define X509_F_X509_LOAD_CERT_FILE 0
+#define X509_F_X509_LOAD_CRL_FILE 0
+#define X509_F_X509_LOOKUP_METH_NEW 0
+#define X509_F_X509_LOOKUP_NEW 0
+#define X509_F_X509_NAME_ADD_ENTRY 0
+#define X509_F_X509_NAME_CANON 0
+#define X509_F_X509_NAME_ENTRY_CREATE_BY_NID 0
+#define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT 0
+#define X509_F_X509_NAME_ENTRY_SET_OBJECT 0
+#define X509_F_X509_NAME_ONELINE 0
+#define X509_F_X509_NAME_PRINT 0
+#define X509_F_X509_OBJECT_NEW 0
+#define X509_F_X509_PRINT_EX_FP 0
+#define X509_F_X509_PUBKEY_DECODE 0
+#define X509_F_X509_PUBKEY_GET 0
+#define X509_F_X509_PUBKEY_GET0 0
+#define X509_F_X509_PUBKEY_SET 0
+#define X509_F_X509_REQ_CHECK_PRIVATE_KEY 0
+#define X509_F_X509_REQ_PRINT_EX 0
+#define X509_F_X509_REQ_PRINT_FP 0
+#define X509_F_X509_REQ_TO_X509 0
+#define X509_F_X509_STORE_ADD_CERT 0
+#define X509_F_X509_STORE_ADD_CRL 0
+#define X509_F_X509_STORE_ADD_LOOKUP 0
+#define X509_F_X509_STORE_CTX_GET1_ISSUER 0
+#define X509_F_X509_STORE_CTX_INIT 0
+#define X509_F_X509_STORE_CTX_NEW 0
+#define X509_F_X509_STORE_CTX_PURPOSE_INHERIT 0
+#define X509_F_X509_STORE_NEW 0
+#define X509_F_X509_TO_X509_REQ 0
+#define X509_F_X509_TRUST_ADD 0
+#define X509_F_X509_TRUST_SET 0
+#define X509_F_X509_VERIFY_CERT 0
+#define X509_F_X509_VERIFY_PARAM_NEW 0
 
 /*
  * X509V3 function codes.
  */
-#  define X509V3_F_A2I_GENERAL_NAME                        0
-#  define X509V3_F_ADDR_VALIDATE_PATH_INTERNAL             0
-#  define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE             0
-#  define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL         0
-#  define X509V3_F_BIGNUM_TO_STRING                        0
-#  define X509V3_F_COPY_EMAIL                              0
-#  define X509V3_F_COPY_ISSUER                             0
-#  define X509V3_F_DO_DIRNAME                              0
-#  define X509V3_F_DO_EXT_I2D                              0
-#  define X509V3_F_DO_EXT_NCONF                            0
-#  define X509V3_F_GNAMES_FROM_SECTNAME                    0
-#  define X509V3_F_I2S_ASN1_ENUMERATED                     0
-#  define X509V3_F_I2S_ASN1_IA5STRING                      0
-#  define X509V3_F_I2S_ASN1_INTEGER                        0
-#  define X509V3_F_I2V_AUTHORITY_INFO_ACCESS               0
-#  define X509V3_F_LEVEL_ADD_NODE                          0
-#  define X509V3_F_NOTICE_SECTION                          0
-#  define X509V3_F_NREF_NOS                                0
-#  define X509V3_F_POLICY_CACHE_CREATE                     0
-#  define X509V3_F_POLICY_CACHE_NEW                        0
-#  define X509V3_F_POLICY_DATA_NEW                         0
-#  define X509V3_F_POLICY_SECTION                          0
-#  define X509V3_F_PROCESS_PCI_VALUE                       0
-#  define X509V3_F_R2I_CERTPOL                             0
-#  define X509V3_F_R2I_PCI                                 0
-#  define X509V3_F_S2I_ASN1_IA5STRING                      0
-#  define X509V3_F_S2I_ASN1_INTEGER                        0
-#  define X509V3_F_S2I_ASN1_OCTET_STRING                   0
-#  define X509V3_F_S2I_SKEY_ID                             0
-#  define X509V3_F_SET_DIST_POINT_NAME                     0
-#  define X509V3_F_SXNET_ADD_ID_ASC                        0
-#  define X509V3_F_SXNET_ADD_ID_INTEGER                    0
-#  define X509V3_F_SXNET_ADD_ID_ULONG                      0
-#  define X509V3_F_SXNET_GET_ID_ASC                        0
-#  define X509V3_F_SXNET_GET_ID_ULONG                      0
-#  define X509V3_F_TREE_INIT                               0
-#  define X509V3_F_V2I_ASIDENTIFIERS                       0
-#  define X509V3_F_V2I_ASN1_BIT_STRING                     0
-#  define X509V3_F_V2I_AUTHORITY_INFO_ACCESS               0
-#  define X509V3_F_V2I_AUTHORITY_KEYID                     0
-#  define X509V3_F_V2I_BASIC_CONSTRAINTS                   0
-#  define X509V3_F_V2I_CRLD                                0
-#  define X509V3_F_V2I_EXTENDED_KEY_USAGE                  0
-#  define X509V3_F_V2I_GENERAL_NAMES                       0
-#  define X509V3_F_V2I_GENERAL_NAME_EX                     0
-#  define X509V3_F_V2I_IDP                                 0
-#  define X509V3_F_V2I_IPADDRBLOCKS                        0
-#  define X509V3_F_V2I_ISSUER_ALT                          0
-#  define X509V3_F_V2I_NAME_CONSTRAINTS                    0
-#  define X509V3_F_V2I_POLICY_CONSTRAINTS                  0
-#  define X509V3_F_V2I_POLICY_MAPPINGS                     0
-#  define X509V3_F_V2I_SUBJECT_ALT                         0
-#  define X509V3_F_V2I_TLS_FEATURE                         0
-#  define X509V3_F_V3_GENERIC_EXTENSION                    0
-#  define X509V3_F_X509V3_ADD1_I2D                         0
-#  define X509V3_F_X509V3_ADD_VALUE                        0
-#  define X509V3_F_X509V3_EXT_ADD                          0
-#  define X509V3_F_X509V3_EXT_ADD_ALIAS                    0
-#  define X509V3_F_X509V3_EXT_I2D                          0
-#  define X509V3_F_X509V3_EXT_NCONF                        0
-#  define X509V3_F_X509V3_GET_SECTION                      0
-#  define X509V3_F_X509V3_GET_STRING                       0
-#  define X509V3_F_X509V3_GET_VALUE_BOOL                   0
-#  define X509V3_F_X509V3_PARSE_LIST                       0
-#  define X509V3_F_X509_PURPOSE_ADD                        0
-#  define X509V3_F_X509_PURPOSE_SET                        0
+#define X509V3_F_A2I_GENERAL_NAME 0
+#define X509V3_F_ADDR_VALIDATE_PATH_INTERNAL 0
+#define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 0
+#define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL 0
+#define X509V3_F_BIGNUM_TO_STRING 0
+#define X509V3_F_COPY_EMAIL 0
+#define X509V3_F_COPY_ISSUER 0
+#define X509V3_F_DO_DIRNAME 0
+#define X509V3_F_DO_EXT_I2D 0
+#define X509V3_F_DO_EXT_NCONF 0
+#define X509V3_F_GNAMES_FROM_SECTNAME 0
+#define X509V3_F_I2S_ASN1_ENUMERATED 0
+#define X509V3_F_I2S_ASN1_IA5STRING 0
+#define X509V3_F_I2S_ASN1_INTEGER 0
+#define X509V3_F_I2V_AUTHORITY_INFO_ACCESS 0
+#define X509V3_F_LEVEL_ADD_NODE 0
+#define X509V3_F_NOTICE_SECTION 0
+#define X509V3_F_NREF_NOS 0
+#define X509V3_F_POLICY_CACHE_CREATE 0
+#define X509V3_F_POLICY_CACHE_NEW 0
+#define X509V3_F_POLICY_DATA_NEW 0
+#define X509V3_F_POLICY_SECTION 0
+#define X509V3_F_PROCESS_PCI_VALUE 0
+#define X509V3_F_R2I_CERTPOL 0
+#define X509V3_F_R2I_PCI 0
+#define X509V3_F_S2I_ASN1_IA5STRING 0
+#define X509V3_F_S2I_ASN1_INTEGER 0
+#define X509V3_F_S2I_ASN1_OCTET_STRING 0
+#define X509V3_F_S2I_SKEY_ID 0
+#define X509V3_F_SET_DIST_POINT_NAME 0
+#define X509V3_F_SXNET_ADD_ID_ASC 0
+#define X509V3_F_SXNET_ADD_ID_INTEGER 0
+#define X509V3_F_SXNET_ADD_ID_ULONG 0
+#define X509V3_F_SXNET_GET_ID_ASC 0
+#define X509V3_F_SXNET_GET_ID_ULONG 0
+#define X509V3_F_TREE_INIT 0
+#define X509V3_F_V2I_ASIDENTIFIERS 0
+#define X509V3_F_V2I_ASN1_BIT_STRING 0
+#define X509V3_F_V2I_AUTHORITY_INFO_ACCESS 0
+#define X509V3_F_V2I_AUTHORITY_KEYID 0
+#define X509V3_F_V2I_BASIC_CONSTRAINTS 0
+#define X509V3_F_V2I_CRLD 0
+#define X509V3_F_V2I_EXTENDED_KEY_USAGE 0
+#define X509V3_F_V2I_GENERAL_NAMES 0
+#define X509V3_F_V2I_GENERAL_NAME_EX 0
+#define X509V3_F_V2I_IDP 0
+#define X509V3_F_V2I_IPADDRBLOCKS 0
+#define X509V3_F_V2I_ISSUER_ALT 0
+#define X509V3_F_V2I_NAME_CONSTRAINTS 0
+#define X509V3_F_V2I_POLICY_CONSTRAINTS 0
+#define X509V3_F_V2I_POLICY_MAPPINGS 0
+#define X509V3_F_V2I_SUBJECT_ALT 0
+#define X509V3_F_V2I_TLS_FEATURE 0
+#define X509V3_F_V3_GENERIC_EXTENSION 0
+#define X509V3_F_X509V3_ADD1_I2D 0
+#define X509V3_F_X509V3_ADD_VALUE 0
+#define X509V3_F_X509V3_EXT_ADD 0
+#define X509V3_F_X509V3_EXT_ADD_ALIAS 0
+#define X509V3_F_X509V3_EXT_I2D 0
+#define X509V3_F_X509V3_EXT_NCONF 0
+#define X509V3_F_X509V3_GET_SECTION 0
+#define X509V3_F_X509V3_GET_STRING 0
+#define X509V3_F_X509V3_GET_VALUE_BOOL 0
+#define X509V3_F_X509V3_PARSE_LIST 0
+#define X509V3_F_X509_PURPOSE_ADD 0
+#define X509V3_F_X509_PURPOSE_SET 0
 
 /*
  * Compatibility defines.
  */
-# define EVP_R_OPERATON_NOT_INITIALIZED    EVP_R_OPERATION_NOT_INITIALIZED
+#define EVP_R_OPERATON_NOT_INITIALIZED EVP_R_OPERATION_NOT_INITIALIZED
 
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/ct.h.in b/include/openssl/ct.h.in
index 3fc2aaa9427e..a6103980d430 100644
--- a/include/openssl/ct.h.in
+++ b/include/openssl/ct.h.in
@@ -9,42 +9,44 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_CT_H
-# define OPENSSL_CT_H
-# pragma once
+#define OPENSSL_CT_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_CT_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_CT_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_CT
-# include <openssl/types.h>
-# include <openssl/safestack.h>
-# include <openssl/x509.h>
-# include <openssl/cterr.h>
-# ifdef  __cplusplus
+#ifndef OPENSSL_NO_CT
+#include <openssl/types.h>
+#include <openssl/safestack.h>
+#include <openssl/x509.h>
+#include <openssl/cterr.h>
+#ifdef __cplusplus
 extern "C" {
-# endif
-
+#endif
 
 /* Minimum RSA key size, from RFC6962 */
-# define SCT_MIN_RSA_BITS 2048
+#define SCT_MIN_RSA_BITS 2048
 
 /* All hashes are SHA256 in v1 of Certificate Transparency */
-# define CT_V1_HASHLEN SHA256_DIGEST_LENGTH
+#define CT_V1_HASHLEN SHA256_DIGEST_LENGTH
 
+/* clang-format off */
 {-
     generate_stack_macros("SCT")
     .generate_stack_macros("CTLOG");
 -}
-
+/* clang-format on */
 
 typedef enum {
     CT_LOG_ENTRY_TYPE_NOT_SET = -1,
@@ -84,7 +86,7 @@ typedef enum {
  * with the CT_POLICY_EVAL_CTX.
  */
 CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new_ex(OSSL_LIB_CTX *libctx,
-                                              const char *propq);
+    const char *propq);
 
 /*
  * The same as CT_POLICY_EVAL_CTX_new_ex() but the default library
@@ -96,7 +98,7 @@ CT_POLICY_EVAL_CTX *CT_POLICY_EVAL_CTX_new(void);
 void CT_POLICY_EVAL_CTX_free(CT_POLICY_EVAL_CTX *ctx);
 
 /* Gets the peer certificate that the SCTs are for */
-X509* CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx);
+X509 *CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx);
 
 /*
  * Sets the certificate associated with the received SCTs.
@@ -106,7 +108,7 @@ X509* CT_POLICY_EVAL_CTX_get0_cert(const CT_POLICY_EVAL_CTX *ctx);
 int CT_POLICY_EVAL_CTX_set1_cert(CT_POLICY_EVAL_CTX *ctx, X509 *cert);
 
 /* Gets the issuer of the aforementioned certificate */
-X509* CT_POLICY_EVAL_CTX_get0_issuer(const CT_POLICY_EVAL_CTX *ctx);
+X509 *CT_POLICY_EVAL_CTX_get0_issuer(const CT_POLICY_EVAL_CTX *ctx);
 
 /*
  * Sets the issuer of the certificate associated with the received SCTs.
@@ -120,7 +122,7 @@ const CTLOG_STORE *CT_POLICY_EVAL_CTX_get0_log_store(const CT_POLICY_EVAL_CTX *c
 
 /* Sets the log store that is in use. It must outlive the CT_POLICY_EVAL_CTX. */
 void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
-                                               CTLOG_STORE *log_store);
+    CTLOG_STORE *log_store);
 
 /*
  * Gets the time, in milliseconds since the Unix epoch, that will be used as the
@@ -152,11 +154,11 @@ SCT *SCT_new(void);
  * The caller is responsible for calling SCT_free when finished with the SCT.
  */
 SCT *SCT_new_from_base64(unsigned char version,
-                         const char *logid_base64,
-                         ct_log_entry_type_t entry_type,
-                         uint64_t timestamp,
-                         const char *extensions_base64,
-                         const char *signature_base64);
+    const char *logid_base64,
+    ct_log_entry_type_t entry_type,
+    uint64_t timestamp,
+    const char *extensions_base64,
+    const char *signature_base64);
 
 /*
  * Frees the SCT and the underlying data structures.
@@ -211,7 +213,7 @@ __owur int SCT_set0_log_id(SCT *sct, unsigned char *log_id, size_t log_id_len);
  * Returns 1 on success, 0 otherwise.
  */
 __owur int SCT_set1_log_id(SCT *sct, const unsigned char *log_id,
-                           size_t log_id_len);
+    size_t log_id_len);
 
 /*
  * Returns the timestamp for the SCT (epoch time in milliseconds).
@@ -257,7 +259,7 @@ void SCT_set0_extensions(SCT *sct, unsigned char *ext, size_t ext_len);
  * Returns 1 on success, 0 otherwise.
  */
 __owur int SCT_set1_extensions(SCT *sct, const unsigned char *ext,
-                               size_t ext_len);
+    size_t ext_len);
 
 /*
  * Set *sig to point to the signature for the SCT. sig must not be NULL.
@@ -277,7 +279,7 @@ void SCT_set0_signature(SCT *sct, unsigned char *sig, size_t sig_len);
  * Returns 1 on success, 0 otherwise.
  */
 __owur int SCT_set1_signature(SCT *sct, const unsigned char *sig,
-                              size_t sig_len);
+    size_t sig_len);
 
 /*
  * The origin of this SCT, e.g. TLS extension, OCSP response, etc.
@@ -311,7 +313,7 @@ void SCT_print(const SCT *sct, BIO *out, int indent, const CTLOG_STORE *logs);
  * came from, so that the log names can be printed.
  */
 void SCT_LIST_print(const STACK_OF(SCT) *sct_list, BIO *out, int indent,
-                    const char *separator, const CTLOG_STORE *logs);
+    const char *separator, const CTLOG_STORE *logs);
 
 /*
  * Gets the last result of validating this SCT.
@@ -336,8 +338,7 @@ __owur int SCT_validate(SCT *sct, const CT_POLICY_EVAL_CTX *ctx);
  * Returns a negative integer if an error occurs.
  */
 __owur int SCT_LIST_validate(const STACK_OF(SCT) *scts,
-                             CT_POLICY_EVAL_CTX *ctx);
-
+    CT_POLICY_EVAL_CTX *ctx);
 
 /*********************************
  * SCT parsing and serialization *
@@ -368,7 +369,7 @@ __owur int i2o_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp);
  * not defined.
  */
 STACK_OF(SCT) *o2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
-                            size_t len);
+    size_t len);
 
 /*
  * Serialize (to DER format) a stack of SCTs and return the length.
@@ -395,7 +396,7 @@ __owur int i2d_SCT_LIST(const STACK_OF(SCT) *a, unsigned char **pp);
  * not defined.
  */
 STACK_OF(SCT) *d2i_SCT_LIST(STACK_OF(SCT) **a, const unsigned char **pp,
-                            long len);
+    long len);
 
 /*
  * Serialize (to TLS format) an |sct| and write it to |out|.
@@ -434,7 +435,7 @@ SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len);
  * Should be deleted by the caller using CTLOG_free when no longer needed.
  */
 CTLOG *CTLOG_new_ex(EVP_PKEY *public_key, const char *name, OSSL_LIB_CTX *libctx,
-                    const char *propq);
+    const char *propq);
 
 /*
  * The same as CTLOG_new_ex except that the default library context and
@@ -451,16 +452,16 @@ CTLOG *CTLOG_new(EVP_PKEY *public_key, const char *name);
  * Should be deleted by the caller using CTLOG_free when no longer needed.
  */
 int CTLOG_new_from_base64_ex(CTLOG **ct_log, const char *pkey_base64,
-                             const char *name, OSSL_LIB_CTX *libctx,
-                             const char *propq);
+    const char *name, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 /*
  * The same as CTLOG_new_from_base64_ex() except that the default
  * library context and property query string are used.
  * Returns 1 on success, 0 on failure.
  */
-int CTLOG_new_from_base64(CTLOG ** ct_log,
-                          const char *pkey_base64, const char *name);
+int CTLOG_new_from_base64(CTLOG **ct_log,
+    const char *pkey_base64, const char *name);
 
 /*
  * Deletes a CT log instance and its fields.
@@ -471,7 +472,7 @@ void CTLOG_free(CTLOG *log);
 const char *CTLOG_get0_name(const CTLOG *log);
 /* Gets the ID of the CT log */
 void CTLOG_get0_log_id(const CTLOG *log, const uint8_t **log_id,
-                       size_t *log_id_len);
+    size_t *log_id_len);
 /* Gets the public key of the CT log */
 EVP_PKEY *CTLOG_get0_public_key(const CTLOG *log);
 
@@ -503,8 +504,8 @@ void CTLOG_STORE_free(CTLOG_STORE *store);
  * Returns the CT log, or NULL if no match is found.
  */
 const CTLOG *CTLOG_STORE_get0_log_by_id(const CTLOG_STORE *store,
-                                        const uint8_t *log_id,
-                                        size_t log_id_len);
+    const uint8_t *log_id,
+    size_t log_id_len);
 
 /*
  * Loads a CT log list into a |store| from a |file|.
@@ -518,8 +519,8 @@ __owur int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file);
  */
 __owur int CTLOG_STORE_load_default_file(CTLOG_STORE *store);
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 #endif
diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h
index 935d32d8b144..950b7b388cc7 100644
--- a/include/openssl/cterr.h
+++ b/include/openssl/cterr.h
@@ -9,37 +9,35 @@
  */
 
 #ifndef OPENSSL_CTERR_H
-# define OPENSSL_CTERR_H
-# pragma once
+#define OPENSSL_CTERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_CT
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_CT
 
 /*
  * CT reason codes.
  */
-#  define CT_R_BASE64_DECODE_ERROR                         108
-#  define CT_R_INVALID_LOG_ID_LENGTH                       100
-#  define CT_R_LOG_CONF_INVALID                            109
-#  define CT_R_LOG_CONF_INVALID_KEY                        110
-#  define CT_R_LOG_CONF_MISSING_DESCRIPTION                111
-#  define CT_R_LOG_CONF_MISSING_KEY                        112
-#  define CT_R_LOG_KEY_INVALID                             113
-#  define CT_R_SCT_FUTURE_TIMESTAMP                        116
-#  define CT_R_SCT_INVALID                                 104
-#  define CT_R_SCT_INVALID_SIGNATURE                       107
-#  define CT_R_SCT_LIST_INVALID                            105
-#  define CT_R_SCT_LOG_ID_MISMATCH                         114
-#  define CT_R_SCT_NOT_SET                                 106
-#  define CT_R_SCT_UNSUPPORTED_VERSION                     115
-#  define CT_R_UNRECOGNIZED_SIGNATURE_NID                  101
-#  define CT_R_UNSUPPORTED_ENTRY_TYPE                      102
-#  define CT_R_UNSUPPORTED_VERSION                         103
+#define CT_R_BASE64_DECODE_ERROR 108
+#define CT_R_INVALID_LOG_ID_LENGTH 100
+#define CT_R_LOG_CONF_INVALID 109
+#define CT_R_LOG_CONF_INVALID_KEY 110
+#define CT_R_LOG_CONF_MISSING_DESCRIPTION 111
+#define CT_R_LOG_CONF_MISSING_KEY 112
+#define CT_R_LOG_KEY_INVALID 113
+#define CT_R_SCT_FUTURE_TIMESTAMP 116
+#define CT_R_SCT_INVALID 104
+#define CT_R_SCT_INVALID_SIGNATURE 107
+#define CT_R_SCT_LIST_INVALID 105
+#define CT_R_SCT_LOG_ID_MISMATCH 114
+#define CT_R_SCT_NOT_SET 106
+#define CT_R_SCT_UNSUPPORTED_VERSION 115
+#define CT_R_UNRECOGNIZED_SIGNATURE_NID 101
+#define CT_R_UNSUPPORTED_ENTRY_TYPE 102
+#define CT_R_UNSUPPORTED_VERSION 103
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/decoder.h b/include/openssl/decoder.h
index d4ee2cf41340..8194c2492acb 100644
--- a/include/openssl/decoder.h
+++ b/include/openssl/decoder.h
@@ -8,26 +8,26 @@
  */
 
 #ifndef OPENSSL_DECODER_H
-# define OPENSSL_DECODER_H
-# pragma once
+#define OPENSSL_DECODER_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <stdarg.h>
-# include <stddef.h>
-# include <openssl/decodererr.h>
-# include <openssl/types.h>
-# include <openssl/core.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#include <stdarg.h>
+#include <stddef.h>
+#include <openssl/decodererr.h>
+#include <openssl/types.h>
+#include <openssl/core.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 OSSL_DECODER *OSSL_DECODER_fetch(OSSL_LIB_CTX *libctx, const char *name,
-                                 const char *properties);
+    const char *properties);
 int OSSL_DECODER_up_ref(OSSL_DECODER *encoder);
 void OSSL_DECODER_free(OSSL_DECODER *encoder);
 
@@ -38,31 +38,31 @@ const char *OSSL_DECODER_get0_description(const OSSL_DECODER *decoder);
 int OSSL_DECODER_is_a(const OSSL_DECODER *encoder, const char *name);
 
 void OSSL_DECODER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                  void (*fn)(OSSL_DECODER *encoder, void *arg),
-                                  void *arg);
+    void (*fn)(OSSL_DECODER *encoder, void *arg),
+    void *arg);
 int OSSL_DECODER_names_do_all(const OSSL_DECODER *encoder,
-                              void (*fn)(const char *name, void *data),
-                              void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *OSSL_DECODER_gettable_params(OSSL_DECODER *decoder);
 int OSSL_DECODER_get_params(OSSL_DECODER *decoder, OSSL_PARAM params[]);
 
 const OSSL_PARAM *OSSL_DECODER_settable_ctx_params(OSSL_DECODER *encoder);
 OSSL_DECODER_CTX *OSSL_DECODER_CTX_new(void);
 int OSSL_DECODER_CTX_set_params(OSSL_DECODER_CTX *ctx,
-                                const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 void OSSL_DECODER_CTX_free(OSSL_DECODER_CTX *ctx);
 
 /* Utilities that help set specific parameters */
 int OSSL_DECODER_CTX_set_passphrase(OSSL_DECODER_CTX *ctx,
-                                    const unsigned char *kstr, size_t klen);
+    const unsigned char *kstr, size_t klen);
 int OSSL_DECODER_CTX_set_pem_password_cb(OSSL_DECODER_CTX *ctx,
-                                         pem_password_cb *cb, void *cbarg);
+    pem_password_cb *cb, void *cbarg);
 int OSSL_DECODER_CTX_set_passphrase_cb(OSSL_DECODER_CTX *ctx,
-                                       OSSL_PASSPHRASE_CALLBACK *cb,
-                                       void *cbarg);
+    OSSL_PASSPHRASE_CALLBACK *cb,
+    void *cbarg);
 int OSSL_DECODER_CTX_set_passphrase_ui(OSSL_DECODER_CTX *ctx,
-                                       const UI_METHOD *ui_method,
-                                       void *ui_data);
+    const UI_METHOD *ui_method,
+    void *ui_data);
 
 /*
  * Utilities to read the object to decode, with the result sent to cb.
@@ -71,12 +71,12 @@ int OSSL_DECODER_CTX_set_passphrase_ui(OSSL_DECODER_CTX *ctx,
 
 int OSSL_DECODER_CTX_set_selection(OSSL_DECODER_CTX *ctx, int selection);
 int OSSL_DECODER_CTX_set_input_type(OSSL_DECODER_CTX *ctx,
-                                    const char *input_type);
+    const char *input_type);
 int OSSL_DECODER_CTX_set_input_structure(OSSL_DECODER_CTX *ctx,
-                                         const char *input_structure);
+    const char *input_structure);
 int OSSL_DECODER_CTX_add_decoder(OSSL_DECODER_CTX *ctx, OSSL_DECODER *decoder);
 int OSSL_DECODER_CTX_add_extra(OSSL_DECODER_CTX *ctx,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OSSL_DECODER_CTX_get_num_decoders(OSSL_DECODER_CTX *ctx);
 
 typedef struct ossl_decoder_instance_st OSSL_DECODER_INSTANCE;
@@ -88,33 +88,33 @@ const char *
 OSSL_DECODER_INSTANCE_get_input_type(OSSL_DECODER_INSTANCE *decoder_inst);
 const char *
 OSSL_DECODER_INSTANCE_get_input_structure(OSSL_DECODER_INSTANCE *decoder_inst,
-                                          int *was_set);
+    int *was_set);
 
 typedef int OSSL_DECODER_CONSTRUCT(OSSL_DECODER_INSTANCE *decoder_inst,
-                                   const OSSL_PARAM *params,
-                                   void *construct_data);
+    const OSSL_PARAM *params,
+    void *construct_data);
 typedef void OSSL_DECODER_CLEANUP(void *construct_data);
 
 int OSSL_DECODER_CTX_set_construct(OSSL_DECODER_CTX *ctx,
-                                   OSSL_DECODER_CONSTRUCT *construct);
+    OSSL_DECODER_CONSTRUCT *construct);
 int OSSL_DECODER_CTX_set_construct_data(OSSL_DECODER_CTX *ctx,
-                                        void *construct_data);
+    void *construct_data);
 int OSSL_DECODER_CTX_set_cleanup(OSSL_DECODER_CTX *ctx,
-                                 OSSL_DECODER_CLEANUP *cleanup);
+    OSSL_DECODER_CLEANUP *cleanup);
 OSSL_DECODER_CONSTRUCT *OSSL_DECODER_CTX_get_construct(OSSL_DECODER_CTX *ctx);
 void *OSSL_DECODER_CTX_get_construct_data(OSSL_DECODER_CTX *ctx);
 OSSL_DECODER_CLEANUP *OSSL_DECODER_CTX_get_cleanup(OSSL_DECODER_CTX *ctx);
 
 int OSSL_DECODER_export(OSSL_DECODER_INSTANCE *decoder_inst,
-                        void *reference, size_t reference_sz,
-                        OSSL_CALLBACK *export_cb, void *export_cbarg);
+    void *reference, size_t reference_sz,
+    OSSL_CALLBACK *export_cb, void *export_cbarg);
 
 int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in);
 #ifndef OPENSSL_NO_STDIO
 int OSSL_DECODER_from_fp(OSSL_DECODER_CTX *ctx, FILE *in);
 #endif
 int OSSL_DECODER_from_data(OSSL_DECODER_CTX *ctx, const unsigned char **pdata,
-                           size_t *pdata_len);
+    size_t *pdata_len);
 
 /*
  * Create the OSSL_DECODER_CTX with an associated type.  This will perform
@@ -122,12 +122,12 @@ int OSSL_DECODER_from_data(OSSL_DECODER_CTX *ctx, const unsigned char **pdata,
  */
 OSSL_DECODER_CTX *
 OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey,
-                              const char *input_type,
-                              const char *input_struct,
-                              const char *keytype, int selection,
-                              OSSL_LIB_CTX *libctx, const char *propquery);
+    const char *input_type,
+    const char *input_struct,
+    const char *keytype, int selection,
+    OSSL_LIB_CTX *libctx, const char *propquery);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/decodererr.h b/include/openssl/decodererr.h
index 4212a38bca2a..5fdeace4f971 100644
--- a/include/openssl/decodererr.h
+++ b/include/openssl/decodererr.h
@@ -9,20 +9,18 @@
  */
 
 #ifndef OPENSSL_DECODERERR_H
-# define OPENSSL_DECODERERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_DECODERERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * OSSL_DECODER reason codes.
  */
-# define OSSL_DECODER_R_COULD_NOT_DECODE_OBJECT           101
-# define OSSL_DECODER_R_DECODER_NOT_FOUND                 102
-# define OSSL_DECODER_R_MISSING_GET_PARAMS                100
+#define OSSL_DECODER_R_COULD_NOT_DECODE_OBJECT 101
+#define OSSL_DECODER_R_DECODER_NOT_FOUND 102
+#define OSSL_DECODER_R_MISSING_GET_PARAMS 100
 
 #endif
diff --git a/include/openssl/des.h b/include/openssl/des.h
index 09798a616ffb..daaef4e820b6 100644
--- a/include/openssl/des.h
+++ b/include/openssl/des.h
@@ -8,29 +8,29 @@
  */
 
 #ifndef OPENSSL_DES_H
-# define OPENSSL_DES_H
-# pragma once
+#define OPENSSL_DES_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DES_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_DES_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_DES
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_DES
+#ifdef __cplusplus
 extern "C" {
-#  endif
-#  include <openssl/e_os2.h>
+#endif
+#include <openssl/e_os2.h>
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef unsigned int DES_LONG;
 
-#   ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#    undef OPENSSL_EXTERN
-#    define OPENSSL_EXTERN OPENSSL_EXPORT
-#   endif
+#ifdef OPENSSL_BUILD_SHLIBCRYPTO
+#undef OPENSSL_EXTERN
+#define OPENSSL_EXTERN OPENSSL_EXPORT
+#endif
 
 typedef unsigned char DES_cblock[8];
 typedef /* const */ unsigned char const_DES_cblock[8];
@@ -49,62 +49,62 @@ typedef struct DES_ks {
     } ks[16];
 } DES_key_schedule;
 
-#   define DES_KEY_SZ      (sizeof(DES_cblock))
-#   define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
+#define DES_KEY_SZ (sizeof(DES_cblock))
+#define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
 
-#   define DES_ENCRYPT     1
-#   define DES_DECRYPT     0
+#define DES_ENCRYPT 1
+#define DES_DECRYPT 0
 
-#   define DES_CBC_MODE    0
-#   define DES_PCBC_MODE   1
+#define DES_CBC_MODE 0
+#define DES_PCBC_MODE 1
 
-#   define DES_ecb2_encrypt(i,o,k1,k2,e) \
-        DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
+#define DES_ecb2_encrypt(i, o, k1, k2, e) \
+    DES_ecb3_encrypt((i), (o), (k1), (k2), (k1), (e))
 
-#   define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
+#define DES_ede2_cbc_encrypt(i, o, l, k1, k2, iv, e) \
+    DES_ede3_cbc_encrypt((i), (o), (l), (k1), (k2), (k1), (iv), (e))
 
-#   define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
+#define DES_ede2_cfb64_encrypt(i, o, l, k1, k2, iv, n, e) \
+    DES_ede3_cfb64_encrypt((i), (o), (l), (k1), (k2), (k1), (iv), (n), (e))
 
-#   define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
+#define DES_ede2_ofb64_encrypt(i, o, l, k1, k2, iv, n) \
+    DES_ede3_ofb64_encrypt((i), (o), (l), (k1), (k2), (k1), (iv), (n))
 
-#   define DES_fixup_key_parity DES_set_odd_parity
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DES_fixup_key_parity DES_set_odd_parity
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *DES_options(void);
 OSSL_DEPRECATEDIN_3_0
 void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
-                      DES_key_schedule *ks1, DES_key_schedule *ks2,
-                      DES_key_schedule *ks3, int enc);
+    DES_key_schedule *ks1, DES_key_schedule *ks2,
+    DES_key_schedule *ks3, int enc);
 OSSL_DEPRECATEDIN_3_0
 DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output,
-                       long length, DES_key_schedule *schedule,
-                       const_DES_cblock *ivec);
-#  endif
+    long length, DES_key_schedule *schedule,
+    const_DES_cblock *ivec);
+#endif
 /* DES_cbc_encrypt does not update the IV!  Use DES_ncbc_encrypt instead. */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 void DES_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                     long length, DES_key_schedule *schedule, DES_cblock *ivec,
-                     int enc);
+    long length, DES_key_schedule *schedule, DES_cblock *ivec,
+    int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule, DES_cblock *ivec,
-                      int enc);
+    long length, DES_key_schedule *schedule, DES_cblock *ivec,
+    int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule, DES_cblock *ivec,
-                      const_DES_cblock *inw, const_DES_cblock *outw, int enc);
+    long length, DES_key_schedule *schedule, DES_cblock *ivec,
+    const_DES_cblock *inw, const_DES_cblock *outw, int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule, DES_cblock *ivec,
-                     int enc);
+    long length, DES_key_schedule *schedule, DES_cblock *ivec,
+    int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
-                     DES_key_schedule *ks, int enc);
-#  endif
+    DES_key_schedule *ks, int enc);
+#endif
 
 /*
  * This is the DES encryption function that gets called by just about every
@@ -116,10 +116,10 @@ void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
  * long's and ks is the DES_key_schedule to use.  enc, is non zero specifies
  * encryption, zero if decryption.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc);
-#  endif
+#endif
 
 /*
  * This functions is the same as DES_encrypt1() except that the DES initial
@@ -129,59 +129,59 @@ void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc);
  * DES_encrypt2() DES_encrypt2() FP() is the same as DES_encrypt1()
  * DES_encrypt1() DES_encrypt1() except faster :-).
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1, DES_key_schedule *ks2,
-                  DES_key_schedule *ks3);
+    DES_key_schedule *ks3);
 OSSL_DEPRECATEDIN_3_0
 void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1, DES_key_schedule *ks2,
-                  DES_key_schedule *ks3);
+    DES_key_schedule *ks3);
 OSSL_DEPRECATEDIN_3_0
 void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                          long length, DES_key_schedule *ks1,
-                          DES_key_schedule *ks2, DES_key_schedule *ks3,
-                          DES_cblock *ivec, int enc);
+    long length, DES_key_schedule *ks1,
+    DES_key_schedule *ks2, DES_key_schedule *ks3,
+    DES_cblock *ivec, int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num, int enc);
+    long length, DES_key_schedule *ks1,
+    DES_key_schedule *ks2, DES_key_schedule *ks3,
+    DES_cblock *ivec, int *num, int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out,
-                          int numbits, long length, DES_key_schedule *ks1,
-                          DES_key_schedule *ks2, DES_key_schedule *ks3,
-                          DES_cblock *ivec, int enc);
+    int numbits, long length, DES_key_schedule *ks1,
+    DES_key_schedule *ks2, DES_key_schedule *ks3,
+    DES_cblock *ivec, int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num);
+    long length, DES_key_schedule *ks1,
+    DES_key_schedule *ks2, DES_key_schedule *ks3,
+    DES_cblock *ivec, int *num);
 OSSL_DEPRECATEDIN_3_0
 char *DES_fcrypt(const char *buf, const char *salt, char *ret);
 OSSL_DEPRECATEDIN_3_0
 char *DES_crypt(const char *buf, const char *salt);
 OSSL_DEPRECATEDIN_3_0
 void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule, DES_cblock *ivec);
+    long length, DES_key_schedule *schedule, DES_cblock *ivec);
 OSSL_DEPRECATEDIN_3_0
 void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
+    long length, DES_key_schedule *schedule,
+    DES_cblock *ivec, int enc);
 OSSL_DEPRECATEDIN_3_0
 DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
-                        long length, int out_count, DES_cblock *seed);
+    long length, int out_count, DES_cblock *seed);
 OSSL_DEPRECATEDIN_3_0 int DES_random_key(DES_cblock *ret);
 OSSL_DEPRECATEDIN_3_0 void DES_set_odd_parity(DES_cblock *key);
 OSSL_DEPRECATEDIN_3_0 int DES_check_key_parity(const_DES_cblock *key);
 OSSL_DEPRECATEDIN_3_0 int DES_is_weak_key(const_DES_cblock *key);
-#  endif
+#endif
 /*
  * DES_set_key (= set_key = DES_key_sched = key_sched) calls
  * DES_set_key_checked
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule);
 OSSL_DEPRECATEDIN_3_0
@@ -195,17 +195,17 @@ OSSL_DEPRECATEDIN_3_0
 void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2);
 OSSL_DEPRECATEDIN_3_0
 void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num, int enc);
+    long length, DES_key_schedule *schedule,
+    DES_cblock *ivec, int *num, int enc);
 OSSL_DEPRECATEDIN_3_0
 void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num);
-#  endif
+    long length, DES_key_schedule *schedule,
+    DES_cblock *ivec, int *num);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 97024929a40d..6d0abe2d217d 100644
--- a/include/openssl/dh.h
+++ b/include/openssl/dh.h
@@ -8,20 +8,20 @@
  */
 
 #ifndef OPENSSL_DH_H
-# define OPENSSL_DH_H
-# pragma once
+#define OPENSSL_DH_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DH_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_DH_H
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/types.h>
+#include <openssl/opensslconf.h>
+#include <openssl/types.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 #include <stdlib.h>
 
@@ -30,16 +30,16 @@ extern "C" {
  * Note that additions/changes to this set of values requires corresponding
  * adjustments to range checks in dh_gen()
  */
-# define DH_PARAMGEN_TYPE_GENERATOR     0   /* Use a safe prime generator */
-# define DH_PARAMGEN_TYPE_FIPS_186_2    1   /* Use FIPS186-2 standard */
-# define DH_PARAMGEN_TYPE_FIPS_186_4    2   /* Use FIPS186-4 standard */
-# define DH_PARAMGEN_TYPE_GROUP         3   /* Use a named safe prime group */
+#define DH_PARAMGEN_TYPE_GENERATOR 0 /* Use a safe prime generator */
+#define DH_PARAMGEN_TYPE_FIPS_186_2 1 /* Use FIPS186-2 standard */
+#define DH_PARAMGEN_TYPE_FIPS_186_4 2 /* Use FIPS186-4 standard */
+#define DH_PARAMGEN_TYPE_GROUP 3 /* Use a named safe prime group */
 
 int EVP_PKEY_CTX_set_dh_paramgen_type(EVP_PKEY_CTX *ctx, int typ);
 int EVP_PKEY_CTX_set_dh_paramgen_gindex(EVP_PKEY_CTX *ctx, int gindex);
 int EVP_PKEY_CTX_set_dh_paramgen_seed(EVP_PKEY_CTX *ctx,
-                                      const unsigned char *seed,
-                                      size_t seedlen);
+    const unsigned char *seed,
+    size_t seedlen);
 int EVP_PKEY_CTX_set_dh_paramgen_prime_len(EVP_PKEY_CTX *ctx, int pbits);
 int EVP_PKEY_CTX_set_dh_paramgen_subprime_len(EVP_PKEY_CTX *ctx, int qlen);
 int EVP_PKEY_CTX_set_dh_paramgen_generator(EVP_PKEY_CTX *ctx, int gen);
@@ -57,68 +57,68 @@ int EVP_PKEY_CTX_get_dh_kdf_md(EVP_PKEY_CTX *ctx, const EVP_MD **md);
 int EVP_PKEY_CTX_set_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int len);
 int EVP_PKEY_CTX_get_dh_kdf_outlen(EVP_PKEY_CTX *ctx, int *len);
 int EVP_PKEY_CTX_set0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm, int len);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm);
 #endif
 
-# define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN     (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DH_RFC5114                (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN  (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_TYPE          (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_DH_KDF_TYPE               (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_DH_KDF_MD                 (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_DH_KDF_MD             (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_DH_KDF_OUTLEN             (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN         (EVP_PKEY_ALG_CTRL + 10)
-# define EVP_PKEY_CTRL_DH_KDF_UKM                (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_GET_DH_KDF_UKM            (EVP_PKEY_ALG_CTRL + 12)
-# define EVP_PKEY_CTRL_DH_KDF_OID                (EVP_PKEY_ALG_CTRL + 13)
-# define EVP_PKEY_CTRL_GET_DH_KDF_OID            (EVP_PKEY_ALG_CTRL + 14)
-# define EVP_PKEY_CTRL_DH_NID                    (EVP_PKEY_ALG_CTRL + 15)
-# define EVP_PKEY_CTRL_DH_PAD                    (EVP_PKEY_ALG_CTRL + 16)
+#define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN (EVP_PKEY_ALG_CTRL + 1)
+#define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR (EVP_PKEY_ALG_CTRL + 2)
+#define EVP_PKEY_CTRL_DH_RFC5114 (EVP_PKEY_ALG_CTRL + 3)
+#define EVP_PKEY_CTRL_DH_PARAMGEN_SUBPRIME_LEN (EVP_PKEY_ALG_CTRL + 4)
+#define EVP_PKEY_CTRL_DH_PARAMGEN_TYPE (EVP_PKEY_ALG_CTRL + 5)
+#define EVP_PKEY_CTRL_DH_KDF_TYPE (EVP_PKEY_ALG_CTRL + 6)
+#define EVP_PKEY_CTRL_DH_KDF_MD (EVP_PKEY_ALG_CTRL + 7)
+#define EVP_PKEY_CTRL_GET_DH_KDF_MD (EVP_PKEY_ALG_CTRL + 8)
+#define EVP_PKEY_CTRL_DH_KDF_OUTLEN (EVP_PKEY_ALG_CTRL + 9)
+#define EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN (EVP_PKEY_ALG_CTRL + 10)
+#define EVP_PKEY_CTRL_DH_KDF_UKM (EVP_PKEY_ALG_CTRL + 11)
+#define EVP_PKEY_CTRL_GET_DH_KDF_UKM (EVP_PKEY_ALG_CTRL + 12)
+#define EVP_PKEY_CTRL_DH_KDF_OID (EVP_PKEY_ALG_CTRL + 13)
+#define EVP_PKEY_CTRL_GET_DH_KDF_OID (EVP_PKEY_ALG_CTRL + 14)
+#define EVP_PKEY_CTRL_DH_NID (EVP_PKEY_ALG_CTRL + 15)
+#define EVP_PKEY_CTRL_DH_PAD (EVP_PKEY_ALG_CTRL + 16)
 
 /* KDF types */
-# define EVP_PKEY_DH_KDF_NONE                            1
-# define EVP_PKEY_DH_KDF_X9_42                           2
+#define EVP_PKEY_DH_KDF_NONE 1
+#define EVP_PKEY_DH_KDF_X9_42 2
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# ifndef OPENSSL_NO_DH
-#  include <openssl/e_os2.h>
-#  include <openssl/bio.h>
-#  include <openssl/asn1.h>
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   include <openssl/bn.h>
-#  endif
-#  include <openssl/dherr.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#ifndef OPENSSL_NO_DH
+#include <openssl/e_os2.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/bn.h>
+#endif
+#include <openssl/dherr.h>
 
-#  ifndef OPENSSL_DH_MAX_MODULUS_BITS
-#   define OPENSSL_DH_MAX_MODULUS_BITS        10000
-#  endif
+#ifndef OPENSSL_DH_MAX_MODULUS_BITS
+#define OPENSSL_DH_MAX_MODULUS_BITS 10000
+#endif
 
-#  ifndef OPENSSL_DH_CHECK_MAX_MODULUS_BITS
-#   define OPENSSL_DH_CHECK_MAX_MODULUS_BITS  32768
-#  endif
+#ifndef OPENSSL_DH_CHECK_MAX_MODULUS_BITS
+#define OPENSSL_DH_CHECK_MAX_MODULUS_BITS 32768
+#endif
 
-#  define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
+#define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024
 
-#  define DH_FLAG_CACHE_MONT_P     0x01
+#define DH_FLAG_CACHE_MONT_P 0x01
 
-#  define DH_FLAG_TYPE_MASK             0xF000
-#  define DH_FLAG_TYPE_DH               0x0000
-#  define DH_FLAG_TYPE_DHX              0x1000
+#define DH_FLAG_TYPE_MASK 0xF000
+#define DH_FLAG_TYPE_DH 0x0000
+#define DH_FLAG_TYPE_DHX 0x1000
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /*
  * Does nothing. Previously this switched off constant time behaviour.
  */
-#   define DH_FLAG_NO_EXP_CONSTTIME 0x00
-#  endif
+#define DH_FLAG_NO_EXP_CONSTTIME 0x00
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  * If this flag is set the DH method is FIPS compliant and can be used in
  * FIPS mode. This is set in the validated module method. If an application
@@ -126,7 +126,7 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm);
  * result is compliant.
  */
 
-#   define DH_FLAG_FIPS_METHOD                     0x0400
+#define DH_FLAG_FIPS_METHOD 0x0400
 
 /*
  * If this flag is set the operations normally disabled in FIPS mode are
@@ -134,8 +134,8 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm);
  * usage is compliant.
  */
 
-#   define DH_FLAG_NON_FIPS_ALLOW                  0x0400
-#  endif
+#define DH_FLAG_NON_FIPS_ALLOW 0x0400
+#endif
 
 /* Already defined in ossl_typ.h */
 /* typedef struct dh_st DH; */
@@ -143,60 +143,60 @@ int EVP_PKEY_CTX_get0_dh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm);
 
 DECLARE_ASN1_ITEM(DHparams)
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define DH_GENERATOR_2          2
-#   define DH_GENERATOR_3          3
-#   define DH_GENERATOR_5          5
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DH_GENERATOR_2 2
+#define DH_GENERATOR_3 3
+#define DH_GENERATOR_5 5
 
 /* DH_check error codes, some of them shared with DH_check_pub_key */
 /*
  * NB: These values must align with the equivalently named macros in
  * internal/ffc.h.
  */
-#   define DH_CHECK_P_NOT_PRIME            0x01
-#   define DH_CHECK_P_NOT_SAFE_PRIME       0x02
-#   define DH_UNABLE_TO_CHECK_GENERATOR    0x04
-#   define DH_NOT_SUITABLE_GENERATOR       0x08
-#   define DH_CHECK_Q_NOT_PRIME            0x10
-#   define DH_CHECK_INVALID_Q_VALUE        0x20 /* +DH_check_pub_key */
-#   define DH_CHECK_INVALID_J_VALUE        0x40
-#   define DH_MODULUS_TOO_SMALL            0x80
-#   define DH_MODULUS_TOO_LARGE            0x100 /* +DH_check_pub_key */
+#define DH_CHECK_P_NOT_PRIME 0x01
+#define DH_CHECK_P_NOT_SAFE_PRIME 0x02
+#define DH_UNABLE_TO_CHECK_GENERATOR 0x04
+#define DH_NOT_SUITABLE_GENERATOR 0x08
+#define DH_CHECK_Q_NOT_PRIME 0x10
+#define DH_CHECK_INVALID_Q_VALUE 0x20 /* +DH_check_pub_key */
+#define DH_CHECK_INVALID_J_VALUE 0x40
+#define DH_MODULUS_TOO_SMALL 0x80
+#define DH_MODULUS_TOO_LARGE 0x100 /* +DH_check_pub_key */
 
 /* DH_check_pub_key error codes */
-#   define DH_CHECK_PUBKEY_TOO_SMALL       0x01
-#   define DH_CHECK_PUBKEY_TOO_LARGE       0x02
-#   define DH_CHECK_PUBKEY_INVALID         0x04
+#define DH_CHECK_PUBKEY_TOO_SMALL 0x01
+#define DH_CHECK_PUBKEY_TOO_LARGE 0x02
+#define DH_CHECK_PUBKEY_INVALID 0x04
 
 /*
  * primes p where (p-1)/2 is prime too are called "safe"; we define this for
  * backward compatibility:
  */
-#   define DH_CHECK_P_NOT_STRONG_PRIME     DH_CHECK_P_NOT_SAFE_PRIME
+#define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME
 
-#   define d2i_DHparams_fp(fp, x) \
-        (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                          (char *(*)())d2i_DHparams, \
-                          (fp), \
-                          (unsigned char **)(x))
-#   define i2d_DHparams_fp(fp, x) \
-        ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x))
-#   define d2i_DHparams_bio(bp, x) \
-        ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x)
-#   define i2d_DHparams_bio(bp, x) \
-        ASN1_i2d_bio_of(DH, i2d_DHparams, bp, x)
+#define d2i_DHparams_fp(fp, x)                 \
+    (DH *)ASN1_d2i_fp((void *(*)(void))DH_new, \
+        (d2i_of_void *)d2i_DHparams,           \
+        (fp),                                  \
+        (void **)(x))
+#define i2d_DHparams_fp(fp, x) \
+    ASN1_i2d_fp(i2d_DHparams, (fp), (unsigned char *)(x))
+#define d2i_DHparams_bio(bp, x) \
+    ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x)
+#define i2d_DHparams_bio(bp, x) \
+    ASN1_i2d_bio_of(DH, i2d_DHparams, bp, x)
 
-#   define d2i_DHxparams_fp(fp,x) \
-        (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                          (char *(*)())d2i_DHxparams, \
-                          (fp), \
-                          (unsigned char **)(x))
-#   define i2d_DHxparams_fp(fp, x) \
-        ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x))
-#   define d2i_DHxparams_bio(bp, x) \
-        ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x)
-#   define i2d_DHxparams_bio(bp, x) \
-        ASN1_i2d_bio_of(DH, i2d_DHxparams, bp, x)
+#define d2i_DHxparams_fp(fp, x)                \
+    (DH *)ASN1_d2i_fp((void *(*)(void))DH_new, \
+        (d2i_of_void *)d2i_DHxparams,          \
+        (fp),                                  \
+        (void **)(x))
+#define i2d_DHxparams_fp(fp, x) \
+    ASN1_i2d_fp(i2d_DHxparams, (fp), (unsigned char *)(x))
+#define d2i_DHxparams_bio(bp, x) \
+    ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x)
+#define i2d_DHxparams_bio(bp, x) \
+    ASN1_i2d_bio_of(DH, i2d_DHxparams, bp, x)
 
 DECLARE_ASN1_DUP_FUNCTION_name_attr(OSSL_DEPRECATEDIN_3_0, DH, DHparams)
 
@@ -214,15 +214,15 @@ OSSL_DEPRECATEDIN_3_0 int DH_bits(const DH *dh);
 OSSL_DEPRECATEDIN_3_0 int DH_size(const DH *dh);
 OSSL_DEPRECATEDIN_3_0 int DH_security_bits(const DH *dh);
 
-#   define DH_get_ex_new_index(l, p, newf, dupf, freef) \
-        CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DH, l, p, newf, dupf, freef)
+#define DH_get_ex_new_index(l, p, newf, dupf, freef) \
+    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DH, l, p, newf, dupf, freef)
 
 OSSL_DEPRECATEDIN_3_0 int DH_set_ex_data(DH *d, int idx, void *arg);
 OSSL_DEPRECATEDIN_3_0 void *DH_get_ex_data(const DH *d, int idx);
 
 OSSL_DEPRECATEDIN_3_0 int DH_generate_parameters_ex(DH *dh, int prime_len,
-                                                    int generator,
-                                                    BN_GENCB *cb);
+    int generator,
+    BN_GENCB *cb);
 
 OSSL_DEPRECATEDIN_3_0 int DH_check_params_ex(const DH *dh);
 OSSL_DEPRECATEDIN_3_0 int DH_check_ex(const DH *dh);
@@ -230,19 +230,19 @@ OSSL_DEPRECATEDIN_3_0 int DH_check_pub_key_ex(const DH *dh, const BIGNUM *pub_ke
 OSSL_DEPRECATEDIN_3_0 int DH_check_params(const DH *dh, int *ret);
 OSSL_DEPRECATEDIN_3_0 int DH_check(const DH *dh, int *codes);
 OSSL_DEPRECATEDIN_3_0 int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key,
-                                           int *codes);
+    int *codes);
 OSSL_DEPRECATEDIN_3_0 int DH_generate_key(DH *dh);
 OSSL_DEPRECATEDIN_3_0 int DH_compute_key(unsigned char *key,
-                                         const BIGNUM *pub_key, DH *dh);
+    const BIGNUM *pub_key, DH *dh);
 OSSL_DEPRECATEDIN_3_0 int DH_compute_key_padded(unsigned char *key,
-                                                const BIGNUM *pub_key, DH *dh);
+    const BIGNUM *pub_key, DH *dh);
 
 DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, DH, DHparams)
 DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, DH, DHxparams)
 
-#   ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 OSSL_DEPRECATEDIN_3_0 int DHparams_print_fp(FILE *fp, const DH *x);
-#   endif
+#endif
 OSSL_DEPRECATEDIN_3_0 int DHparams_print(BIO *bp, const DH *x);
 
 /* RFC 5114 parameters */
@@ -256,16 +256,16 @@ OSSL_DEPRECATEDIN_3_0 int DH_get_nid(const DH *dh);
 
 /* RFC2631 KDF */
 OSSL_DEPRECATEDIN_3_0 int DH_KDF_X9_42(unsigned char *out, size_t outlen,
-                                       const unsigned char *Z, size_t Zlen,
-                                       ASN1_OBJECT *key_oid,
-                                       const unsigned char *ukm,
-                                       size_t ukmlen, const EVP_MD *md);
+    const unsigned char *Z, size_t Zlen,
+    ASN1_OBJECT *key_oid,
+    const unsigned char *ukm,
+    size_t ukmlen, const EVP_MD *md);
 
 OSSL_DEPRECATEDIN_3_0 void DH_get0_pqg(const DH *dh, const BIGNUM **p,
-                                       const BIGNUM **q, const BIGNUM **g);
+    const BIGNUM **q, const BIGNUM **g);
 OSSL_DEPRECATEDIN_3_0 int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);
 OSSL_DEPRECATEDIN_3_0 void DH_get0_key(const DH *dh, const BIGNUM **pub_key,
-                                       const BIGNUM **priv_key);
+    const BIGNUM **priv_key);
 OSSL_DEPRECATEDIN_3_0 int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *DH_get0_p(const DH *dh);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *DH_get0_q(const DH *dh);
@@ -288,52 +288,46 @@ OSSL_DEPRECATEDIN_3_0 int DH_meth_get_flags(const DH_METHOD *dhm);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set_flags(DH_METHOD *dhm, int flags);
 OSSL_DEPRECATEDIN_3_0 void *DH_meth_get0_app_data(const DH_METHOD *dhm);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data);
-OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_generate_key(const DH_METHOD *dhm)) (DH *);
+OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_generate_key(const DH_METHOD *dhm))(DH *);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set_generate_key(DH_METHOD *dhm,
-                                                   int (*generate_key) (DH *));
-OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_compute_key(const DH_METHOD *dhm))
-                                                   (unsigned char *key,
-                                                    const BIGNUM *pub_key,
-                                                    DH *dh);
+    int (*generate_key)(DH *));
+OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_compute_key(const DH_METHOD *dhm))(unsigned char *key,
+    const BIGNUM *pub_key,
+    DH *dh);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set_compute_key(DH_METHOD *dhm,
-                                                  int (*compute_key)
-                                                  (unsigned char *key,
-                                                   const BIGNUM *pub_key,
-                                                   DH *dh));
-OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))
-                                                   (const DH *, BIGNUM *,
-                                                    const BIGNUM *,
-                                                    const BIGNUM *,
-                                                    const BIGNUM *, BN_CTX *,
-                                                    BN_MONT_CTX *);
+    int (*compute_key)(unsigned char *key,
+        const BIGNUM *pub_key,
+        DH *dh));
+OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))(const DH *, BIGNUM *,
+    const BIGNUM *,
+    const BIGNUM *,
+    const BIGNUM *, BN_CTX *,
+    BN_MONT_CTX *);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set_bn_mod_exp(DH_METHOD *dhm,
-                                                 int (*bn_mod_exp)
-                                                 (const DH *, BIGNUM *,
-                                                  const BIGNUM *, const BIGNUM *,
-                                                  const BIGNUM *, BN_CTX *,
-                                                  BN_MONT_CTX *));
+    int (*bn_mod_exp)(const DH *, BIGNUM *,
+        const BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *,
+        BN_MONT_CTX *));
 OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_init(const DH_METHOD *dhm))(DH *);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set_init(DH_METHOD *dhm, int (*init)(DH *));
-OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_finish(const DH_METHOD *dhm)) (DH *);
-OSSL_DEPRECATEDIN_3_0 int DH_meth_set_finish(DH_METHOD *dhm, int (*finish) (DH *));
-OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_generate_params(const DH_METHOD *dhm))
-                                                        (DH *, int, int,
-                                                         BN_GENCB *);
+OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_finish(const DH_METHOD *dhm))(DH *);
+OSSL_DEPRECATEDIN_3_0 int DH_meth_set_finish(DH_METHOD *dhm, int (*finish)(DH *));
+OSSL_DEPRECATEDIN_3_0 int (*DH_meth_get_generate_params(const DH_METHOD *dhm))(DH *, int, int,
+    BN_GENCB *);
 OSSL_DEPRECATEDIN_3_0 int DH_meth_set_generate_params(DH_METHOD *dhm,
-                                                      int (*generate_params)
-                                                      (DH *, int, int,
-                                                       BN_GENCB *));
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+    int (*generate_params)(DH *, int, int,
+        BN_GENCB *));
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
-#  ifndef OPENSSL_NO_DEPRECATED_0_9_8
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
 OSSL_DEPRECATEDIN_0_9_8 DH *DH_generate_parameters(int prime_len, int generator,
-                                                   void (*callback) (int, int,
-                                                                void *),
-                                                   void *cb_arg);
-#  endif
+    void (*callback)(int, int,
+        void *),
+    void *cb_arg);
+#endif
 
-# endif
-# ifdef  __cplusplus
+#endif
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h
index 2997d7d4c2c8..753659be16f8 100644
--- a/include/openssl/dherr.h
+++ b/include/openssl/dherr.h
@@ -9,51 +9,49 @@
  */
 
 #ifndef OPENSSL_DHERR_H
-# define OPENSSL_DHERR_H
-# pragma once
+#define OPENSSL_DHERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_DH
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_DH
 
 /*
  * DH reason codes.
  */
-#  define DH_R_BAD_FFC_PARAMETERS                          127
-#  define DH_R_BAD_GENERATOR                               101
-#  define DH_R_BN_DECODE_ERROR                             109
-#  define DH_R_BN_ERROR                                    106
-#  define DH_R_CHECK_INVALID_J_VALUE                       115
-#  define DH_R_CHECK_INVALID_Q_VALUE                       116
-#  define DH_R_CHECK_PUBKEY_INVALID                        122
-#  define DH_R_CHECK_PUBKEY_TOO_LARGE                      123
-#  define DH_R_CHECK_PUBKEY_TOO_SMALL                      124
-#  define DH_R_CHECK_P_NOT_PRIME                           117
-#  define DH_R_CHECK_P_NOT_SAFE_PRIME                      118
-#  define DH_R_CHECK_Q_NOT_PRIME                           119
-#  define DH_R_DECODE_ERROR                                104
-#  define DH_R_INVALID_PARAMETER_NAME                      110
-#  define DH_R_INVALID_PARAMETER_NID                       114
-#  define DH_R_INVALID_PUBKEY                              102
-#  define DH_R_INVALID_SECRET                              128
-#  define DH_R_INVALID_SIZE                                129
-#  define DH_R_KDF_PARAMETER_ERROR                         112
-#  define DH_R_KEYS_NOT_SET                                108
-#  define DH_R_MISSING_PUBKEY                              125
-#  define DH_R_MODULUS_TOO_LARGE                           103
-#  define DH_R_MODULUS_TOO_SMALL                           126
-#  define DH_R_NOT_SUITABLE_GENERATOR                      120
-#  define DH_R_NO_PARAMETERS_SET                           107
-#  define DH_R_NO_PRIVATE_VALUE                            100
-#  define DH_R_PARAMETER_ENCODING_ERROR                    105
-#  define DH_R_PEER_KEY_ERROR                              111
-#  define DH_R_Q_TOO_LARGE                                 130
-#  define DH_R_SHARED_INFO_ERROR                           113
-#  define DH_R_UNABLE_TO_CHECK_GENERATOR                   121
+#define DH_R_BAD_FFC_PARAMETERS 127
+#define DH_R_BAD_GENERATOR 101
+#define DH_R_BN_DECODE_ERROR 109
+#define DH_R_BN_ERROR 106
+#define DH_R_CHECK_INVALID_J_VALUE 115
+#define DH_R_CHECK_INVALID_Q_VALUE 116
+#define DH_R_CHECK_PUBKEY_INVALID 122
+#define DH_R_CHECK_PUBKEY_TOO_LARGE 123
+#define DH_R_CHECK_PUBKEY_TOO_SMALL 124
+#define DH_R_CHECK_P_NOT_PRIME 117
+#define DH_R_CHECK_P_NOT_SAFE_PRIME 118
+#define DH_R_CHECK_Q_NOT_PRIME 119
+#define DH_R_DECODE_ERROR 104
+#define DH_R_INVALID_PARAMETER_NAME 110
+#define DH_R_INVALID_PARAMETER_NID 114
+#define DH_R_INVALID_PUBKEY 102
+#define DH_R_INVALID_SECRET 128
+#define DH_R_INVALID_SIZE 129
+#define DH_R_KDF_PARAMETER_ERROR 112
+#define DH_R_KEYS_NOT_SET 108
+#define DH_R_MISSING_PUBKEY 125
+#define DH_R_MODULUS_TOO_LARGE 103
+#define DH_R_MODULUS_TOO_SMALL 126
+#define DH_R_NOT_SUITABLE_GENERATOR 120
+#define DH_R_NO_PARAMETERS_SET 107
+#define DH_R_NO_PRIVATE_VALUE 100
+#define DH_R_PARAMETER_ENCODING_ERROR 105
+#define DH_R_PEER_KEY_ERROR 111
+#define DH_R_Q_TOO_LARGE 130
+#define DH_R_SHARED_INFO_ERROR 113
+#define DH_R_UNABLE_TO_CHECK_GENERATOR 121
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index 109878e68863..61baa64bee7e 100644
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -8,60 +8,60 @@
  */
 
 #ifndef OPENSSL_DSA_H
-# define OPENSSL_DSA_H
-# pragma once
+#define OPENSSL_DSA_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DSA_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_DSA_H
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/types.h>
+#include <openssl/opensslconf.h>
+#include <openssl/types.h>
 
-# include <stdlib.h>
+#include <stdlib.h>
 
-# ifndef OPENSSL_NO_DSA
-#  include <openssl/e_os2.h>
-#  include <openssl/asn1.h>
-#  include <openssl/bio.h>
-#  include <openssl/crypto.h>
-#  include <openssl/bn.h>
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   include <openssl/dh.h>
-#  endif
-#  include <openssl/dsaerr.h>
-#  ifndef OPENSSL_NO_STDIO
-#   include <stdio.h>
-#  endif
-# endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/e_os2.h>
+#include <openssl/asn1.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/bn.h>
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/dh.h>
+#endif
+#include <openssl/dsaerr.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 int EVP_PKEY_CTX_set_dsa_paramgen_bits(EVP_PKEY_CTX *ctx, int nbits);
 int EVP_PKEY_CTX_set_dsa_paramgen_q_bits(EVP_PKEY_CTX *ctx, int qbits);
 int EVP_PKEY_CTX_set_dsa_paramgen_md_props(EVP_PKEY_CTX *ctx,
-                                           const char *md_name,
-                                           const char *md_properties);
+    const char *md_name,
+    const char *md_properties);
 int EVP_PKEY_CTX_set_dsa_paramgen_gindex(EVP_PKEY_CTX *ctx, int gindex);
 int EVP_PKEY_CTX_set_dsa_paramgen_type(EVP_PKEY_CTX *ctx, const char *name);
 int EVP_PKEY_CTX_set_dsa_paramgen_seed(EVP_PKEY_CTX *ctx,
-                                       const unsigned char *seed,
-                                       size_t seedlen);
+    const unsigned char *seed,
+    size_t seedlen);
 int EVP_PKEY_CTX_set_dsa_paramgen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_BITS         (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS       (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_MD           (EVP_PKEY_ALG_CTRL + 3)
+#define EVP_PKEY_CTRL_DSA_PARAMGEN_BITS (EVP_PKEY_ALG_CTRL + 1)
+#define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS (EVP_PKEY_ALG_CTRL + 2)
+#define EVP_PKEY_CTRL_DSA_PARAMGEN_MD (EVP_PKEY_ALG_CTRL + 3)
 
-# ifndef OPENSSL_NO_DSA
-#  ifndef OPENSSL_DSA_MAX_MODULUS_BITS
-#   define OPENSSL_DSA_MAX_MODULUS_BITS   10000
-#  endif
+#ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_DSA_MAX_MODULUS_BITS
+#define OPENSSL_DSA_MAX_MODULUS_BITS 10000
+#endif
 
-#  define OPENSSL_DSA_FIPS_MIN_MODULUS_BITS 1024
+#define OPENSSL_DSA_FIPS_MIN_MODULUS_BITS 1024
 
 typedef struct DSA_SIG_st DSA_SIG;
 DSA_SIG *DSA_SIG_new(void);
@@ -70,16 +70,15 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_only(DSA_SIG, DSA_SIG)
 void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps);
 int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s);
 
-
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /*
  * Does nothing. Previously this switched off constant time behaviour.
  */
-#   define DSA_FLAG_NO_EXP_CONSTTIME       0x00
-#  endif
+#define DSA_FLAG_NO_EXP_CONSTTIME 0x00
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define DSA_FLAG_CACHE_MONT_P   0x01
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DSA_FLAG_CACHE_MONT_P 0x01
 
 /*
  * If this flag is set the DSA method is FIPS compliant and can be used in
@@ -88,7 +87,7 @@ int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s);
  * result is compliant.
  */
 
-#   define DSA_FLAG_FIPS_METHOD                    0x0400
+#define DSA_FLAG_FIPS_METHOD 0x0400
 
 /*
  * If this flag is set the operations normally disabled in FIPS mode are
@@ -96,29 +95,29 @@ int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s);
  * usage is compliant.
  */
 
-#   define DSA_FLAG_NON_FIPS_ALLOW                 0x0400
-#   define DSA_FLAG_FIPS_CHECKED                   0x0800
+#define DSA_FLAG_NON_FIPS_ALLOW 0x0400
+#define DSA_FLAG_FIPS_CHECKED 0x0800
 
 /* Already defined in ossl_typ.h */
 /* typedef struct dsa_st DSA; */
 /* typedef struct dsa_method DSA_METHOD; */
 
-#   define d2i_DSAparams_fp(fp, x) \
-        (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
-                           (char *(*)())d2i_DSAparams, (fp), \
-                           (unsigned char **)(x))
-#   define i2d_DSAparams_fp(fp, x) \
-        ASN1_i2d_fp(i2d_DSAparams, (fp), (unsigned char *)(x))
-#   define d2i_DSAparams_bio(bp, x) \
-        ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAparams, bp, x)
-#   define i2d_DSAparams_bio(bp, x) \
-        ASN1_i2d_bio_of(DSA, i2d_DSAparams, bp, x)
+#define d2i_DSAparams_fp(fp, x)                  \
+    (DSA *)ASN1_d2i_fp((void *(*)(void))DSA_new, \
+        (d2i_of_void *)d2i_DSAparams, (fp),      \
+        (void **)(x))
+#define i2d_DSAparams_fp(fp, x) \
+    ASN1_i2d_fp(i2d_DSAparams, (fp), (unsigned char *)(x))
+#define d2i_DSAparams_bio(bp, x) \
+    ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAparams, bp, x)
+#define i2d_DSAparams_bio(bp, x) \
+    ASN1_i2d_bio_of(DSA, i2d_DSAparams, bp, x)
 
 DECLARE_ASN1_DUP_FUNCTION_name_attr(OSSL_DEPRECATEDIN_3_0, DSA, DSAparams)
 OSSL_DEPRECATEDIN_3_0 DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen,
-                                           DSA *dsa);
+    DSA *dsa);
 OSSL_DEPRECATEDIN_3_0 int DSA_do_verify(const unsigned char *dgst, int dgst_len,
-                                        DSA_SIG *sig, DSA *dsa);
+    DSA_SIG *sig, DSA *dsa);
 
 OSSL_DEPRECATEDIN_3_0 const DSA_METHOD *DSA_OpenSSL(void);
 
@@ -135,81 +134,81 @@ OSSL_DEPRECATEDIN_3_0 int DSA_up_ref(DSA *r);
 OSSL_DEPRECATEDIN_3_0 int DSA_size(const DSA *);
 OSSL_DEPRECATEDIN_3_0 int DSA_bits(const DSA *d);
 OSSL_DEPRECATEDIN_3_0 int DSA_security_bits(const DSA *d);
-        /* next 4 return -1 on error */
+/* next 4 return -1 on error */
 OSSL_DEPRECATEDIN_3_0 int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in,
-                                         BIGNUM **kinvp, BIGNUM **rp);
+    BIGNUM **kinvp, BIGNUM **rp);
 OSSL_DEPRECATEDIN_3_0 int DSA_sign(int type, const unsigned char *dgst,
-                                   int dlen, unsigned char *sig,
-                                   unsigned int *siglen, DSA *dsa);
+    int dlen, unsigned char *sig,
+    unsigned int *siglen, DSA *dsa);
 OSSL_DEPRECATEDIN_3_0 int DSA_verify(int type, const unsigned char *dgst,
-                                     int dgst_len, const unsigned char *sigbuf,
-                                     int siglen, DSA *dsa);
+    int dgst_len, const unsigned char *sigbuf,
+    int siglen, DSA *dsa);
 
-#   define DSA_get_ex_new_index(l, p, newf, dupf, freef) \
-        CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DSA, l, p, newf, dupf, freef)
+#define DSA_get_ex_new_index(l, p, newf, dupf, freef) \
+    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DSA, l, p, newf, dupf, freef)
 OSSL_DEPRECATEDIN_3_0 int DSA_set_ex_data(DSA *d, int idx, void *arg);
 OSSL_DEPRECATEDIN_3_0 void *DSA_get_ex_data(const DSA *d, int idx);
 
 DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0,
-                                        DSA, DSAPublicKey)
+    DSA, DSAPublicKey)
 DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0,
-                                        DSA, DSAPrivateKey)
+    DSA, DSAPrivateKey)
 DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0,
-                                        DSA, DSAparams)
-#  endif
+    DSA, DSAparams)
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_0_9_8
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
 /* Deprecated version */
 OSSL_DEPRECATEDIN_0_9_8
 DSA *DSA_generate_parameters(int bits, unsigned char *seed, int seed_len,
-                             int *counter_ret, unsigned long *h_ret,
-                             void (*callback) (int, int, void *),
-                             void *cb_arg);
-#  endif
+    int *counter_ret, unsigned long *h_ret,
+    void (*callback)(int, int, void *),
+    void *cb_arg);
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* New version */
 OSSL_DEPRECATEDIN_3_0 int DSA_generate_parameters_ex(DSA *dsa, int bits,
-                                                     const unsigned char *seed,
-                                                     int seed_len,
-                                                     int *counter_ret,
-                                                     unsigned long *h_ret,
-                                                     BN_GENCB *cb);
+    const unsigned char *seed,
+    int seed_len,
+    int *counter_ret,
+    unsigned long *h_ret,
+    BN_GENCB *cb);
 
 OSSL_DEPRECATEDIN_3_0 int DSA_generate_key(DSA *a);
 
 OSSL_DEPRECATEDIN_3_0 int DSAparams_print(BIO *bp, const DSA *x);
 OSSL_DEPRECATEDIN_3_0 int DSA_print(BIO *bp, const DSA *x, int off);
-#   ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 OSSL_DEPRECATEDIN_3_0 int DSAparams_print_fp(FILE *fp, const DSA *x);
 OSSL_DEPRECATEDIN_3_0 int DSA_print_fp(FILE *bp, const DSA *x, int off);
-#   endif
+#endif
 
-#   define DSS_prime_checks 64
+#define DSS_prime_checks 64
 /*
  * Primality test according to FIPS PUB 186-4, Appendix C.3. Since we only
  * have one value here we set the number of checks to 64 which is the 128 bit
  * security level that is the highest level and valid for creating a 3072 bit
  * DSA key.
  */
-#   define DSA_is_prime(n, callback, cb_arg) \
-            BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
+#define DSA_is_prime(n, callback, cb_arg) \
+    BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
 
-#   ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 /*
  * Convert DSA structure (key or just parameters) into DH structure (be
  * careful to avoid small subgroup attacks when using this!)
  */
 OSSL_DEPRECATEDIN_3_0 DH *DSA_dup_DH(const DSA *r);
-#   endif
+#endif
 
 OSSL_DEPRECATEDIN_3_0 void DSA_get0_pqg(const DSA *d, const BIGNUM **p,
-                                        const BIGNUM **q, const BIGNUM **g);
+    const BIGNUM **q, const BIGNUM **g);
 OSSL_DEPRECATEDIN_3_0 int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g);
 OSSL_DEPRECATEDIN_3_0 void DSA_get0_key(const DSA *d, const BIGNUM **pub_key,
-                                        const BIGNUM **priv_key);
+    const BIGNUM **priv_key);
 OSSL_DEPRECATEDIN_3_0 int DSA_set0_key(DSA *d, BIGNUM *pub_key,
-                                       BIGNUM *priv_key);
+    BIGNUM *priv_key);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *DSA_get0_p(const DSA *d);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *DSA_get0_q(const DSA *d);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *DSA_get0_g(const DSA *d);
@@ -225,56 +224,50 @@ OSSL_DEPRECATEDIN_3_0 void DSA_meth_free(DSA_METHOD *dsam);
 OSSL_DEPRECATEDIN_3_0 DSA_METHOD *DSA_meth_dup(const DSA_METHOD *dsam);
 OSSL_DEPRECATEDIN_3_0 const char *DSA_meth_get0_name(const DSA_METHOD *dsam);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set1_name(DSA_METHOD *dsam,
-                                             const char *name);
+    const char *name);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_get_flags(const DSA_METHOD *dsam);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_flags(DSA_METHOD *dsam, int flags);
 OSSL_DEPRECATEDIN_3_0 void *DSA_meth_get0_app_data(const DSA_METHOD *dsam);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set0_app_data(DSA_METHOD *dsam,
-                                                 void *app_data);
-OSSL_DEPRECATEDIN_3_0 DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))
-        (const unsigned char *, int, DSA *);
+    void *app_data);
+OSSL_DEPRECATEDIN_3_0 DSA_SIG *(*DSA_meth_get_sign(const DSA_METHOD *dsam))(const unsigned char *, int, DSA *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_sign(DSA_METHOD *dsam,
-                       DSA_SIG *(*sign) (const unsigned char *, int, DSA *));
-OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))
-        (DSA *, BN_CTX *, BIGNUM **, BIGNUM **);
+    DSA_SIG *(*sign)(const unsigned char *, int, DSA *));
+OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_sign_setup(const DSA_METHOD *dsam))(DSA *, BN_CTX *, BIGNUM **, BIGNUM **);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_sign_setup(DSA_METHOD *dsam,
-        int (*sign_setup) (DSA *, BN_CTX *, BIGNUM **, BIGNUM **));
-OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
-        (const unsigned char *, int, DSA_SIG *, DSA *);
+    int (*sign_setup)(DSA *, BN_CTX *, BIGNUM **, BIGNUM **));
+OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_verify(const DSA_METHOD *dsam))(const unsigned char *, int, DSA_SIG *, DSA *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_verify(DSA_METHOD *dsam,
-    int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *));
-OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))
-        (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
-         const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *);
+    int (*verify)(const unsigned char *, int, DSA_SIG *, DSA *));
+OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
+    const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_mod_exp(DSA_METHOD *dsam,
-    int (*mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
-                    const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
-                    BN_MONT_CTX *));
-OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))
-    (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
-     BN_CTX *, BN_MONT_CTX *);
+    int (*mod_exp)(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
+        const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
+        BN_MONT_CTX *));
+OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
+    BN_CTX *, BN_MONT_CTX *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam,
-    int (*bn_mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
-                       const BIGNUM *, BN_CTX *, BN_MONT_CTX *));
+    int (*bn_mod_exp)(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
+        const BIGNUM *, BN_CTX *, BN_MONT_CTX *));
 OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_init(const DSA_METHOD *dsam))(DSA *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_init(DSA_METHOD *dsam,
-                                            int (*init)(DSA *));
+    int (*init)(DSA *));
 OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_finish(const DSA_METHOD *dsam))(DSA *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_finish(DSA_METHOD *dsam,
-                                              int (*finish)(DSA *));
-OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))
-        (DSA *, int, const unsigned char *, int, int *, unsigned long *,
-         BN_GENCB *);
+    int (*finish)(DSA *));
+OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_paramgen(const DSA_METHOD *dsam))(DSA *, int, const unsigned char *, int, int *, unsigned long *,
+    BN_GENCB *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_paramgen(DSA_METHOD *dsam,
-        int (*paramgen) (DSA *, int, const unsigned char *, int, int *,
-                         unsigned long *, BN_GENCB *));
+    int (*paramgen)(DSA *, int, const unsigned char *, int, int *,
+        unsigned long *, BN_GENCB *));
 OSSL_DEPRECATEDIN_3_0 int (*DSA_meth_get_keygen(const DSA_METHOD *dsam))(DSA *);
 OSSL_DEPRECATEDIN_3_0 int DSA_meth_set_keygen(DSA_METHOD *dsam,
-                                              int (*keygen) (DSA *));
+    int (*keygen)(DSA *));
 
-#  endif
-# endif
-# ifdef  __cplusplus
+#endif
+#endif
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h
index 26ada57d80ab..cc5f4bfbb7c3 100644
--- a/include/openssl/dsaerr.h
+++ b/include/openssl/dsaerr.h
@@ -9,36 +9,34 @@
  */
 
 #ifndef OPENSSL_DSAERR_H
-# define OPENSSL_DSAERR_H
-# pragma once
+#define OPENSSL_DSAERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_DSA
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_DSA
 
 /*
  * DSA reason codes.
  */
-#  define DSA_R_BAD_FFC_PARAMETERS                         114
-#  define DSA_R_BAD_Q_VALUE                                102
-#  define DSA_R_BN_DECODE_ERROR                            108
-#  define DSA_R_BN_ERROR                                   109
-#  define DSA_R_DECODE_ERROR                               104
-#  define DSA_R_INVALID_DIGEST_TYPE                        106
-#  define DSA_R_INVALID_PARAMETERS                         112
-#  define DSA_R_MISSING_PARAMETERS                         101
-#  define DSA_R_MISSING_PRIVATE_KEY                        111
-#  define DSA_R_MODULUS_TOO_LARGE                          103
-#  define DSA_R_NO_PARAMETERS_SET                          107
-#  define DSA_R_PARAMETER_ENCODING_ERROR                   105
-#  define DSA_R_P_NOT_PRIME                                115
-#  define DSA_R_Q_NOT_PRIME                                113
-#  define DSA_R_SEED_LEN_SMALL                             110
-#  define DSA_R_TOO_MANY_RETRIES                           116
+#define DSA_R_BAD_FFC_PARAMETERS 114
+#define DSA_R_BAD_Q_VALUE 102
+#define DSA_R_BN_DECODE_ERROR 108
+#define DSA_R_BN_ERROR 109
+#define DSA_R_DECODE_ERROR 104
+#define DSA_R_INVALID_DIGEST_TYPE 106
+#define DSA_R_INVALID_PARAMETERS 112
+#define DSA_R_MISSING_PARAMETERS 101
+#define DSA_R_MISSING_PRIVATE_KEY 111
+#define DSA_R_MODULUS_TOO_LARGE 103
+#define DSA_R_NO_PARAMETERS_SET 107
+#define DSA_R_PARAMETER_ENCODING_ERROR 105
+#define DSA_R_P_NOT_PRIME 115
+#define DSA_R_Q_NOT_PRIME 113
+#define DSA_R_SEED_LEN_SMALL 110
+#define DSA_R_TOO_MANY_RETRIES 116
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h
index 5dc6b5419c27..0b42948d02d8 100644
--- a/include/openssl/dtls1.h
+++ b/include/openssl/dtls1.h
@@ -8,50 +8,50 @@
  */
 
 #ifndef OPENSSL_DTLS1_H
-# define OPENSSL_DTLS1_H
-# pragma once
+#define OPENSSL_DTLS1_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_DTLS1_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_DTLS1_H
+#endif
 
-# include <openssl/prov_ssl.h>
+#include <openssl/prov_ssl.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 #include <openssl/opensslconf.h>
 
 /* DTLS*_VERSION constants are defined in prov_ssl.h */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define DTLS_MIN_VERSION                DTLS1_VERSION
-#  define DTLS_MAX_VERSION                DTLS1_2_VERSION
-# endif
-# define DTLS1_VERSION_MAJOR             0xFE
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DTLS_MIN_VERSION DTLS1_VERSION
+#define DTLS_MAX_VERSION DTLS1_2_VERSION
+#endif
+#define DTLS1_VERSION_MAJOR 0xFE
 
 /* Special value for method supporting multiple versions */
-# define DTLS_ANY_VERSION                0x1FFFF
+#define DTLS_ANY_VERSION 0x1FFFF
 
 /* lengths of messages */
 
-# define DTLS1_COOKIE_LENGTH                     255
+#define DTLS1_COOKIE_LENGTH 255
 
-# define DTLS1_RT_HEADER_LENGTH                  13
+#define DTLS1_RT_HEADER_LENGTH 13
 
-# define DTLS1_HM_HEADER_LENGTH                  12
+#define DTLS1_HM_HEADER_LENGTH 12
 
-# define DTLS1_HM_BAD_FRAGMENT                   -2
-# define DTLS1_HM_FRAGMENT_RETRY                 -3
+#define DTLS1_HM_BAD_FRAGMENT -2
+#define DTLS1_HM_FRAGMENT_RETRY -3
 
-# define DTLS1_CCS_HEADER_LENGTH                  1
+#define DTLS1_CCS_HEADER_LENGTH 1
 
-# define DTLS1_AL_HEADER_LENGTH                   2
+#define DTLS1_AL_HEADER_LENGTH 2
 
-# define DTLS1_TMO_ALERT_COUNT                     12
+#define DTLS1_TMO_ALERT_COUNT 12
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index b8c61079159f..86a572bb12e3 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OPENSSL_E_OS2_H
-# define OPENSSL_E_OS2_H
-# pragma once
+#define OPENSSL_E_OS2_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_E_OS2_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_E_OS2_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -28,7 +28,7 @@ extern "C" {
  * However, if none is defined, Unix is assumed.
  **/
 
-# define OPENSSL_SYS_UNIX
+#define OPENSSL_SYS_UNIX
 
 /* --------------------- Microsoft operating systems ---------------------- */
 
@@ -36,9 +36,9 @@ extern "C" {
  * Note that MSDOS actually denotes 32-bit environments running on top of
  * MS-DOS, such as DJGPP one.
  */
-# if defined(OPENSSL_SYS_MSDOS)
-#  undef OPENSSL_SYS_UNIX
-# endif
+#if defined(OPENSSL_SYS_MSDOS)
+#undef OPENSSL_SYS_UNIX
+#endif
 
 /*
  * For 32 bit environment, there seems to be the CygWin environment and then
@@ -48,110 +48,110 @@ extern "C" {
  * UEFI lives here because it might be built with a Microsoft toolchain and
  * we need to avoid the false positive match on Windows.
  */
-# if defined(OPENSSL_SYS_UEFI)
-#  undef OPENSSL_SYS_UNIX
-# elif defined(OPENSSL_SYS_UWIN)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WIN32_UWIN
-# else
-#  if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
-#   define OPENSSL_SYS_WIN32_CYGWIN
-#  else
-#   if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)
-#    undef OPENSSL_SYS_UNIX
-#    if !defined(OPENSSL_SYS_WIN32)
-#     define OPENSSL_SYS_WIN32
-#    endif
-#   endif
-#   if defined(_WIN64) || defined(OPENSSL_SYS_WIN64)
-#    undef OPENSSL_SYS_UNIX
-#    if !defined(OPENSSL_SYS_WIN64)
-#     define OPENSSL_SYS_WIN64
-#    endif
-#   endif
-#   if defined(OPENSSL_SYS_WINNT)
-#    undef OPENSSL_SYS_UNIX
-#   endif
-#   if defined(OPENSSL_SYS_WINCE)
-#    undef OPENSSL_SYS_UNIX
-#   endif
-#  endif
-# endif
+#if defined(OPENSSL_SYS_UEFI)
+#undef OPENSSL_SYS_UNIX
+#elif defined(OPENSSL_SYS_UWIN)
+#undef OPENSSL_SYS_UNIX
+#define OPENSSL_SYS_WIN32_UWIN
+#else
+#if defined(__CYGWIN__) || defined(OPENSSL_SYS_CYGWIN)
+#define OPENSSL_SYS_WIN32_CYGWIN
+#else
+#if defined(_WIN32) || defined(OPENSSL_SYS_WIN32)
+#undef OPENSSL_SYS_UNIX
+#if !defined(OPENSSL_SYS_WIN32)
+#define OPENSSL_SYS_WIN32
+#endif
+#endif
+#if defined(_WIN64) || defined(OPENSSL_SYS_WIN64)
+#undef OPENSSL_SYS_UNIX
+#if !defined(OPENSSL_SYS_WIN64)
+#define OPENSSL_SYS_WIN64
+#endif
+#endif
+#if defined(OPENSSL_SYS_WINNT)
+#undef OPENSSL_SYS_UNIX
+#endif
+#if defined(OPENSSL_SYS_WINCE)
+#undef OPENSSL_SYS_UNIX
+#endif
+#endif
+#endif
 
 /* Anything that tries to look like Microsoft is "Windows" */
-# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN64) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_SYS_MSDOS
-#   define OPENSSL_SYS_MSDOS
-#  endif
-# endif
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN64) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
+#undef OPENSSL_SYS_UNIX
+#define OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_SYS_MSDOS
+#define OPENSSL_SYS_MSDOS
+#endif
+#endif
 
 /*
  * DLL settings.  This part is a bit tough, because it's up to the
  * application implementer how he or she will link the application, so it
  * requires some macro to be used.
  */
-# ifdef OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_OPT_WINDLL
-#   if defined(_WINDLL)         /* This is used when building OpenSSL to
-                                 * indicate that DLL linkage should be used */
-#    define OPENSSL_OPT_WINDLL
-#   endif
-#  endif
-# endif
+#ifdef OPENSSL_SYS_WINDOWS
+#ifndef OPENSSL_OPT_WINDLL
+#if defined(_WINDLL) /* This is used when building OpenSSL to \
+                      * indicate that DLL linkage should be used */
+#define OPENSSL_OPT_WINDLL
+#endif
+#endif
+#endif
 
 /* ------------------------------- OpenVMS -------------------------------- */
-# if defined(__VMS) || defined(VMS)
-#  if !defined(OPENSSL_SYS_VMS)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_VMS
-#  endif
-#  if defined(__DECC)
-#   define OPENSSL_SYS_VMS_DECC
-#  elif defined(__DECCXX)
-#   define OPENSSL_SYS_VMS_DECC
-#   define OPENSSL_SYS_VMS_DECCXX
-#  else
-#   define OPENSSL_SYS_VMS_NODECC
-#  endif
-# endif
+#if defined(__VMS) || defined(VMS)
+#if !defined(OPENSSL_SYS_VMS)
+#undef OPENSSL_SYS_UNIX
+#define OPENSSL_SYS_VMS
+#endif
+#if defined(__DECC)
+#define OPENSSL_SYS_VMS_DECC
+#elif defined(__DECCXX)
+#define OPENSSL_SYS_VMS_DECC
+#define OPENSSL_SYS_VMS_DECCXX
+#else
+#define OPENSSL_SYS_VMS_NODECC
+#endif
+#endif
 
 /* -------------------------------- Unix ---------------------------------- */
-# ifdef OPENSSL_SYS_UNIX
-#  if defined(linux) || defined(__linux__) && !defined(OPENSSL_SYS_LINUX)
-#   define OPENSSL_SYS_LINUX
-#  endif
-#  if defined(_AIX) && !defined(OPENSSL_SYS_AIX)
-#   define OPENSSL_SYS_AIX
-#  endif
-# endif
+#ifdef OPENSSL_SYS_UNIX
+#if defined(linux) || defined(__linux__) && !defined(OPENSSL_SYS_LINUX)
+#define OPENSSL_SYS_LINUX
+#endif
+#if defined(_AIX) && !defined(OPENSSL_SYS_AIX)
+#define OPENSSL_SYS_AIX
+#endif
+#endif
 
 /* -------------------------------- VOS ----------------------------------- */
-# if defined(__VOS__) && !defined(OPENSSL_SYS_VOS)
-#  define OPENSSL_SYS_VOS
-#  ifdef __HPPA__
-#   define OPENSSL_SYS_VOS_HPPA
-#  endif
-#  ifdef __IA32__
-#   define OPENSSL_SYS_VOS_IA32
-#  endif
-# endif
+#if defined(__VOS__) && !defined(OPENSSL_SYS_VOS)
+#define OPENSSL_SYS_VOS
+#ifdef __HPPA__
+#define OPENSSL_SYS_VOS_HPPA
+#endif
+#ifdef __IA32__
+#define OPENSSL_SYS_VOS_IA32
+#endif
+#endif
 
 /* ---------------------------- HP NonStop -------------------------------- */
-# ifdef __TANDEM
-#  ifdef _STRING
-#   include <strings.h>
-#  endif
-# define OPENSSL_USE_BUILD_DATE
-# if defined(OPENSSL_THREADS) && defined(_SPT_MODEL_)
-#  define  SPT_THREAD_SIGNAL 1
-#  define  SPT_THREAD_AWARE 1
-#  include <spthread.h>
-# elif defined(OPENSSL_THREADS) && defined(_PUT_MODEL_)
-#  include <pthread.h>
-# endif
-# endif
+#ifdef __TANDEM
+#ifdef _STRING
+#include <strings.h>
+#endif
+#define OPENSSL_USE_BUILD_DATE
+#if defined(OPENSSL_THREADS) && defined(_SPT_MODEL_)
+#define SPT_THREAD_SIGNAL 1
+#define SPT_THREAD_AWARE 1
+#include <spthread.h>
+#elif defined(OPENSSL_THREADS) && defined(_PUT_MODEL_)
+#include <pthread.h>
+#endif
+#endif
 
 /**
  * That's it for OS-specific stuff
@@ -176,51 +176,51 @@ extern "C" {
  * have some generally sensible values.
  */
 
-# if defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-#  define OPENSSL_EXPORT extern __declspec(dllexport)
-#  define OPENSSL_EXTERN extern __declspec(dllimport)
-# else
-#  define OPENSSL_EXPORT extern
-#  define OPENSSL_EXTERN extern
-# endif
+#if defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
+#define OPENSSL_EXPORT extern __declspec(dllexport)
+#define OPENSSL_EXTERN extern __declspec(dllimport)
+#else
+#define OPENSSL_EXPORT extern
+#define OPENSSL_EXTERN extern
+#endif
 
-# ifdef _WIN32
-#  ifdef _WIN64
-#   define ossl_ssize_t __int64
-#   define OSSL_SSIZE_MAX _I64_MAX
-#  else
-#   define ossl_ssize_t int
-#   define OSSL_SSIZE_MAX INT_MAX
-#  endif
-# endif
+#ifdef _WIN32
+#ifdef _WIN64
+#define ossl_ssize_t __int64
+#define OSSL_SSIZE_MAX _I64_MAX
+#else
+#define ossl_ssize_t int
+#define OSSL_SSIZE_MAX INT_MAX
+#endif
+#endif
 
-# if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
-#  define ossl_ssize_t INTN
-#  define OSSL_SSIZE_MAX MAX_INTN
-# endif
+#if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
+#define ossl_ssize_t INTN
+#define OSSL_SSIZE_MAX MAX_INTN
+#endif
 
-# ifndef ossl_ssize_t
-#  include <sys/types.h>
-#  define ossl_ssize_t ssize_t
-#  if defined(SSIZE_MAX)
-#   define OSSL_SSIZE_MAX SSIZE_MAX
-#  elif defined(_POSIX_SSIZE_MAX)
-#   define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX
-#  else
-#   define OSSL_SSIZE_MAX ((ssize_t)(SIZE_MAX>>1))
-#  endif
-# endif
+#ifndef ossl_ssize_t
+#include <sys/types.h>
+#define ossl_ssize_t ssize_t
+#if defined(SSIZE_MAX)
+#define OSSL_SSIZE_MAX SSIZE_MAX
+#elif defined(_POSIX_SSIZE_MAX)
+#define OSSL_SSIZE_MAX _POSIX_SSIZE_MAX
+#else
+#define OSSL_SSIZE_MAX ((ssize_t)(SIZE_MAX >> 1))
+#endif
+#endif
 
-# if defined(UNUSEDRESULT_DEBUG)
-#  define __owur __attribute__((__warn_unused_result__))
-# else
-#  define __owur
-# endif
+#if defined(UNUSEDRESULT_DEBUG)
+#define __owur __attribute__((__warn_unused_result__))
+#else
+#define __owur
+#endif
 
 /* Standard integer types */
-# define OPENSSL_NO_INTTYPES_H
-# define OPENSSL_NO_STDINT_H
-# if defined(OPENSSL_SYS_UEFI)
+#define OPENSSL_NO_INTTYPES_H
+#define OPENSSL_NO_STDINT_H
+#if defined(OPENSSL_SYS_UEFI)
 typedef INT8 int8_t;
 typedef UINT8 uint8_t;
 typedef INT16 int16_t;
@@ -230,14 +230,12 @@ typedef UINT32 uint32_t;
 typedef INT64 int64_t;
 typedef UINT64 uint64_t;
 typedef UINTN uintptr_t;
-# elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-     defined(__osf__) || defined(__sgi) || defined(__hpux) || \
-     defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)
-#  include <inttypes.h>
-#  undef OPENSSL_NO_INTTYPES_H
+#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__osf__) || defined(__sgi) || defined(__hpux) || defined(OPENSSL_SYS_VMS) || defined(__OpenBSD__)
+#include <inttypes.h>
+#undef OPENSSL_NO_INTTYPES_H
 /* Because the specs say that inttypes.h includes stdint.h if present */
-#  undef OPENSSL_NO_STDINT_H
-# elif defined(_MSC_VER) && _MSC_VER<1600
+#undef OPENSSL_NO_STDINT_H
+#elif defined(_MSC_VER) && _MSC_VER < 1600
 /*
  * minimally required typdefs for systems not supporting inttypes.h or
  * stdint.h: currently just older VC++
@@ -250,61 +248,59 @@ typedef int int32_t;
 typedef unsigned int uint32_t;
 typedef __int64 int64_t;
 typedef unsigned __int64 uint64_t;
-# elif defined(OPENSSL_SYS_TANDEM)
-#  include <stdint.h>
-#  include <sys/types.h>
-# else
-#  include <stdint.h>
-#  undef OPENSSL_NO_STDINT_H
-# endif
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \
-    defined(INTMAX_MAX) && defined(UINTMAX_MAX)
+#elif defined(OPENSSL_SYS_TANDEM)
+#include <stdint.h>
+#include <sys/types.h>
+#else
+#include <stdint.h>
+#undef OPENSSL_NO_STDINT_H
+#endif
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && defined(INTMAX_MAX) && defined(UINTMAX_MAX)
 typedef intmax_t ossl_intmax_t;
 typedef uintmax_t ossl_uintmax_t;
-# else
+#else
 /* Fall back to the largest we know we require and can handle */
 typedef int64_t ossl_intmax_t;
 typedef uint64_t ossl_uintmax_t;
-# endif
+#endif
 
 /* ossl_inline: portable inline definition usable in public headers */
-# if !defined(inline) && !defined(__cplusplus)
-#  if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
-   /* just use inline */
-#   define ossl_inline inline
-#  elif defined(__GNUC__) && __GNUC__>=2
-#   define ossl_inline __inline__
-#  elif defined(_MSC_VER)
-  /*
-   * Visual Studio: inline is available in C++ only, however
-   * __inline is available for C, see
-   * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx
-   */
-#   define ossl_inline __inline
-#  else
-#   define ossl_inline
-#  endif
-# else
-#  define ossl_inline inline
-# endif
+#if !defined(inline) && !defined(__cplusplus)
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+/* just use inline */
+#define ossl_inline inline
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#define ossl_inline __inline__
+#elif defined(_MSC_VER)
+/*
+ * Visual Studio: inline is available in C++ only, however
+ * __inline is available for C, see
+ * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx
+ */
+#define ossl_inline __inline
+#else
+#define ossl_inline
+#endif
+#else
+#define ossl_inline inline
+#endif
 
-# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && \
-     !defined(__cplusplus)
-#  define ossl_noreturn _Noreturn
-# elif defined(__GNUC__) && __GNUC__ >= 2
-#  define ossl_noreturn __attribute__((noreturn))
-# else
-#  define ossl_noreturn
-# endif
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+#define ossl_noreturn _Noreturn
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#define ossl_noreturn __attribute__((noreturn))
+#else
+#define ossl_noreturn
+#endif
 
 /* ossl_unused: portable unused attribute for use in public headers */
-# if defined(__GNUC__)
-#  define ossl_unused __attribute__((unused))
-# else
-#  define ossl_unused
-# endif
+#if defined(__GNUC__)
+#define ossl_unused __attribute__((unused))
+#else
+#define ossl_unused
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/e_ostime.h b/include/openssl/e_ostime.h
index 0e1748750499..c0f1c547db72 100644
--- a/include/openssl/e_ostime.h
+++ b/include/openssl/e_ostime.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OPENSSL_E_OSTIME_H
-# define OPENSSL_E_OSTIME_H
-# pragma once
+#define OPENSSL_E_OSTIME_H
+#pragma once
 
-# include <openssl/macros.h>
-# include <openssl/opensslconf.h>
-# include <openssl/e_os2.h>
+#include <openssl/macros.h>
+#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 
 /*
  * This header guarantees that 'struct timeval' will be available. It includes
@@ -21,18 +21,18 @@
  * substantial set of headers on some platforms (e.g. <winsock2.h> on Win32).
  */
 
-# if defined(OPENSSL_SYS_WINDOWS)
-#  if !defined(_WINSOCKAPI_)
-    /*
-     * winsock2.h defines _WINSOCK2API_ and both winsock2.h and winsock.h define
-     * _WINSOCKAPI_. Both of these provide struct timeval. Don't include
-     * winsock2.h if either header has been included to avoid breakage with
-     * applications that prefer to use <winsock.h> over <winsock2.h>.
-     */
-#   include <winsock2.h>
-#  endif
-# else
-#  include <sys/time.h>
-# endif
+#if defined(OPENSSL_SYS_WINDOWS)
+#if !defined(_WINSOCKAPI_)
+/*
+ * winsock2.h defines _WINSOCK2API_ and both winsock2.h and winsock.h define
+ * _WINSOCKAPI_. Both of these provide struct timeval. Don't include
+ * winsock2.h if either header has been included to avoid breakage with
+ * applications that prefer to use <winsock.h> over <winsock2.h>.
+ */
+#include <winsock2.h>
+#endif
+#else
+#include <sys/time.h>
+#endif
 
 #endif
diff --git a/include/openssl/ebcdic.h b/include/openssl/ebcdic.h
index e0ae1aa84e4a..f2171bb05546 100644
--- a/include/openssl/ebcdic.h
+++ b/include/openssl/ebcdic.h
@@ -8,32 +8,32 @@
  */
 
 #ifndef OPENSSL_EBCDIC_H
-# define OPENSSL_EBCDIC_H
-# pragma once
+#define OPENSSL_EBCDIC_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_EBCDIC_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_EBCDIC_H
+#endif
 
-# include <stdlib.h>
+#include <stdlib.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Avoid name clashes with other applications */
-# define os_toascii   _openssl_os_toascii
-# define os_toebcdic  _openssl_os_toebcdic
-# define ebcdic2ascii _openssl_ebcdic2ascii
-# define ascii2ebcdic _openssl_ascii2ebcdic
+#define os_toascii _openssl_os_toascii
+#define os_toebcdic _openssl_os_toebcdic
+#define ebcdic2ascii _openssl_ebcdic2ascii
+#define ascii2ebcdic _openssl_ascii2ebcdic
 
 extern const unsigned char os_toascii[256];
 extern const unsigned char os_toebcdic[256];
 void *ebcdic2ascii(void *dest, const void *srce, size_t count);
 void *ascii2ebcdic(void *dest, const void *srce, size_t count);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index e1cbe982287b..cdde09ca62b6 100644
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -9,26 +9,26 @@
  */
 
 #ifndef OPENSSL_EC_H
-# define OPENSSL_EC_H
-# pragma once
+#define OPENSSL_EC_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_EC_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_EC_H
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/types.h>
+#include <openssl/opensslconf.h>
+#include <openssl/types.h>
 
-# include <string.h>
+#include <string.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /* Values for EVP_PKEY_CTX_set_ec_param_enc() */
-# define OPENSSL_EC_EXPLICIT_CURVE  0x000
-# define OPENSSL_EC_NAMED_CURVE     0x001
+#define OPENSSL_EC_EXPLICIT_CURVE 0x000
+#define OPENSSL_EC_NAMED_CURVE 0x001
 
 int EVP_PKEY_CTX_set_ec_paramgen_curve_nid(EVP_PKEY_CTX *ctx, int nid);
 int EVP_PKEY_CTX_set_ec_param_enc(EVP_PKEY_CTX *ctx, int param_enc);
@@ -45,68 +45,68 @@ int EVP_PKEY_CTX_set_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int len);
 int EVP_PKEY_CTX_get_ecdh_kdf_outlen(EVP_PKEY_CTX *ctx, int *len);
 
 int EVP_PKEY_CTX_set0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char *ukm,
-                                   int len);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    int len);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_CTX_get0_ecdh_kdf_ukm(EVP_PKEY_CTX *ctx, unsigned char **ukm);
-# endif
+#endif
 
-# define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID    (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_EC_PARAM_ENC             (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_EC_ECDH_COFACTOR         (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_EC_KDF_TYPE              (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_EC_KDF_MD                (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_GET_EC_KDF_MD            (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_EC_KDF_OUTLEN            (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN        (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_EC_KDF_UKM               (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_GET_EC_KDF_UKM           (EVP_PKEY_ALG_CTRL + 10)
+#define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID (EVP_PKEY_ALG_CTRL + 1)
+#define EVP_PKEY_CTRL_EC_PARAM_ENC (EVP_PKEY_ALG_CTRL + 2)
+#define EVP_PKEY_CTRL_EC_ECDH_COFACTOR (EVP_PKEY_ALG_CTRL + 3)
+#define EVP_PKEY_CTRL_EC_KDF_TYPE (EVP_PKEY_ALG_CTRL + 4)
+#define EVP_PKEY_CTRL_EC_KDF_MD (EVP_PKEY_ALG_CTRL + 5)
+#define EVP_PKEY_CTRL_GET_EC_KDF_MD (EVP_PKEY_ALG_CTRL + 6)
+#define EVP_PKEY_CTRL_EC_KDF_OUTLEN (EVP_PKEY_ALG_CTRL + 7)
+#define EVP_PKEY_CTRL_GET_EC_KDF_OUTLEN (EVP_PKEY_ALG_CTRL + 8)
+#define EVP_PKEY_CTRL_EC_KDF_UKM (EVP_PKEY_ALG_CTRL + 9)
+#define EVP_PKEY_CTRL_GET_EC_KDF_UKM (EVP_PKEY_ALG_CTRL + 10)
 
 /* KDF types */
-# define EVP_PKEY_ECDH_KDF_NONE                      1
-# define EVP_PKEY_ECDH_KDF_X9_63                     2
+#define EVP_PKEY_ECDH_KDF_NONE 1
+#define EVP_PKEY_ECDH_KDF_X9_63 2
 /*
  * The old name for EVP_PKEY_ECDH_KDF_X9_63
  *  The ECDH KDF specification has been mistakenly attributed to ANSI X9.62,
  *  it is actually specified in ANSI X9.63.
  *  This identifier is retained for backwards compatibility
  */
-# define EVP_PKEY_ECDH_KDF_X9_62   EVP_PKEY_ECDH_KDF_X9_63
+#define EVP_PKEY_ECDH_KDF_X9_62 EVP_PKEY_ECDH_KDF_X9_63
 
 /** Enum for the point conversion form as defined in X9.62 (ECDSA)
  *  for the encoding of a elliptic curve point (x,y) */
 typedef enum {
-        /** the point is encoded as z||x, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
+    /** the point is encoded as z||x, where the octet z specifies
+     *  which solution of the quadratic equation y is  */
     POINT_CONVERSION_COMPRESSED = 2,
-        /** the point is encoded as z||x||y, where z is the octet 0x04  */
+    /** the point is encoded as z||x||y, where z is the octet 0x04  */
     POINT_CONVERSION_UNCOMPRESSED = 4,
-        /** the point is encoded as z||x||y, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
+    /** the point is encoded as z||x||y, where the octet z specifies
+     *  which solution of the quadratic equation y is  */
     POINT_CONVERSION_HYBRID = 6
 } point_conversion_form_t;
 
 const char *OSSL_EC_curve_nid2name(int nid);
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# ifndef OPENSSL_NO_EC
-#  include <openssl/asn1.h>
-#  include <openssl/symhacks.h>
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   include <openssl/bn.h>
-#  endif
-#  include <openssl/ecerr.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#ifndef OPENSSL_NO_EC
+#include <openssl/asn1.h>
+#include <openssl/symhacks.h>
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/bn.h>
+#endif
+#include <openssl/ecerr.h>
 
-#  ifndef OPENSSL_ECC_MAX_FIELD_BITS
-#   define OPENSSL_ECC_MAX_FIELD_BITS 661
-#  endif
+#ifndef OPENSSL_ECC_MAX_FIELD_BITS
+#define OPENSSL_ECC_MAX_FIELD_BITS 661
+#endif
 
-#  include <openssl/params.h>
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#include <openssl/params.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef struct ec_method_st EC_METHOD;
-#  endif
+#endif
 typedef struct ec_group_st EC_GROUP;
 typedef struct ec_point_st EC_POINT;
 typedef struct ecpk_parameters_st ECPKPARAMETERS;
@@ -116,7 +116,7 @@ typedef struct ec_parameters_st ECPARAMETERS;
 /*               EC_METHODs for curves over GF(p)                   */
 /********************************************************************/
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Returns the basic GFp ec methods which provides the basis for the
  *  optimized methods.
  *  \return  EC_METHOD object
@@ -133,7 +133,7 @@ OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GFp_mont_method(void);
  */
 OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GFp_nist_method(void);
 
-#   ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 /** Returns 64-bit optimized methods for nistp224
  *  \return  EC_METHOD object
  */
@@ -148,9 +148,9 @@ OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GFp_nistp256_method(void);
  *  \return  EC_METHOD object
  */
 OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GFp_nistp521_method(void);
-#   endif /* OPENSSL_NO_EC_NISTP_64_GCC_128 */
+#endif /* OPENSSL_NO_EC_NISTP_64_GCC_128 */
 
-#   ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 /********************************************************************/
 /*           EC_METHOD for curves over GF(2^m)                      */
 /********************************************************************/
@@ -160,7 +160,7 @@ OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GFp_nistp521_method(void);
  */
 OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GF2m_simple_method(void);
 
-#   endif
+#endif
 
 /********************************************************************/
 /*                   EC_GROUP functions                             */
@@ -189,7 +189,7 @@ OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group)
  *  \return NID of the underlying field type OID.
  */
 OSSL_DEPRECATEDIN_3_0 int EC_METHOD_get_field_type(const EC_METHOD *meth);
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /** Frees a EC_GROUP object
  *  \param  group  EC_GROUP object to be freed.
@@ -219,7 +219,7 @@ EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
-                           const BIGNUM *order, const BIGNUM *cofactor);
+    const BIGNUM *order, const BIGNUM *cofactor);
 
 /** Returns the generator of a EC_GROUP object.
  *  \param  group  EC_GROUP object
@@ -230,7 +230,7 @@ const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group);
 /** Returns the montgomery data for order(Generator)
  *  \param  group  EC_GROUP object
  *  \return the currently used montgomery data (possibly NULL).
-*/
+ */
 BN_MONT_CTX *EC_GROUP_get_mont_data(const EC_GROUP *group);
 
 /** Gets the order of a EC_GROUP
@@ -260,7 +260,7 @@ int EC_GROUP_order_bits(const EC_GROUP *group);
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
-                          BN_CTX *ctx);
+    BN_CTX *ctx);
 
 /** Gets the cofactor of an EC_GROUP
  *  \param  group  EC_GROUP object
@@ -296,7 +296,7 @@ void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag);
 int EC_GROUP_get_asn1_flag(const EC_GROUP *group);
 
 void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
-                                        point_conversion_form_t form);
+    point_conversion_form_t form);
 point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *);
 
 unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x);
@@ -314,7 +314,7 @@ size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                       const BIGNUM *b, BN_CTX *ctx);
+    const BIGNUM *b, BN_CTX *ctx);
 
 /** Gets the parameters of the ec curve defined by y^2 = x^3 + a*x + b (for GFp)
  *  or y^2 + x*y = x^3 + a*x^2 + b (for GF2m)
@@ -327,9 +327,9 @@ int EC_GROUP_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
-                       BN_CTX *ctx);
+    BN_CTX *ctx);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Sets the parameters of an ec curve. Synonym for EC_GROUP_set_curve
  *  \param  group  EC_GROUP object
  *  \param  p      BIGNUM with the prime number (GFp) or the polynomial
@@ -340,10 +340,10 @@ int EC_GROUP_get_curve(const EC_GROUP *group, BIGNUM *p, BIGNUM *a, BIGNUM *b,
  *  \return 1 on success and 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 int EC_GROUP_set_curve_GFp(EC_GROUP *group,
-                                                 const BIGNUM *p,
-                                                 const BIGNUM *a,
-                                                 const BIGNUM *b,
-                                                 BN_CTX *ctx);
+    const BIGNUM *p,
+    const BIGNUM *a,
+    const BIGNUM *b,
+    BN_CTX *ctx);
 
 /** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
  *  \param  group  EC_GROUP object
@@ -355,11 +355,11 @@ OSSL_DEPRECATEDIN_3_0 int EC_GROUP_set_curve_GFp(EC_GROUP *group,
  *  \return 1 on success and 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 int EC_GROUP_get_curve_GFp(const EC_GROUP *group,
-                                                 BIGNUM *p,
-                                                 BIGNUM *a, BIGNUM *b,
-                                                 BN_CTX *ctx);
+    BIGNUM *p,
+    BIGNUM *a, BIGNUM *b,
+    BN_CTX *ctx);
 
-#   ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 /** Sets the parameter of an ec curve. Synonym for EC_GROUP_set_curve
  *  \param  group  EC_GROUP object
  *  \param  p      BIGNUM with the prime number (GFp) or the polynomial
@@ -370,10 +370,10 @@ OSSL_DEPRECATEDIN_3_0 int EC_GROUP_get_curve_GFp(const EC_GROUP *group,
  *  \return 1 on success and 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 int EC_GROUP_set_curve_GF2m(EC_GROUP *group,
-                                                  const BIGNUM *p,
-                                                  const BIGNUM *a,
-                                                  const BIGNUM *b,
-                                                  BN_CTX *ctx);
+    const BIGNUM *p,
+    const BIGNUM *a,
+    const BIGNUM *b,
+    BN_CTX *ctx);
 
 /** Gets the parameters of an ec curve. Synonym for EC_GROUP_get_curve
  *  \param  group  EC_GROUP object
@@ -385,11 +385,11 @@ OSSL_DEPRECATEDIN_3_0 int EC_GROUP_set_curve_GF2m(EC_GROUP *group,
  *  \return 1 on success and 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 int EC_GROUP_get_curve_GF2m(const EC_GROUP *group,
-                                                  BIGNUM *p,
-                                                  BIGNUM *a, BIGNUM *b,
-                                                  BN_CTX *ctx);
-#   endif /* OPENSSL_NO_EC2M */
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+    BIGNUM *p,
+    BIGNUM *a, BIGNUM *b,
+    BN_CTX *ctx);
+#endif /* OPENSSL_NO_EC2M */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /** Returns the number of bits needed to represent a field element
  *  \param  group  EC_GROUP object
@@ -433,8 +433,8 @@ int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx);
  *  \return newly created EC_GROUP object with the specified parameters
  */
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *ctx);
-#  ifndef OPENSSL_NO_EC2M
+    const BIGNUM *b, BN_CTX *ctx);
+#ifndef OPENSSL_NO_EC2M
 /** Creates a new EC_GROUP object with the specified parameters defined
  *  over GF2m (defined by the equation y^2 + x*y = x^3 + a*x^2 + b)
  *  \param  p    BIGNUM with the polynomial defining the underlying field
@@ -444,8 +444,8 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
  *  \return newly created EC_GROUP object with the specified parameters
  */
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
-                                  const BIGNUM *b, BN_CTX *ctx);
-#  endif
+    const BIGNUM *b, BN_CTX *ctx);
+#endif
 
 /**
  * Creates a EC_GROUP object with a curve specified by parameters.
@@ -458,7 +458,7 @@ EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
  *          if an error occurred
  */
 EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
-                                   OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 /**
  * Creates an OSSL_PARAM array with the parameters describing the given
@@ -474,7 +474,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[],
  *          describing the given EC_GROUP or NULL if an error occurred
  */
 OSSL_PARAM *EC_GROUP_to_params(const EC_GROUP *group, OSSL_LIB_CTX *libctx,
-                               const char *propq, BN_CTX *bnctx);
+    const char *propq, BN_CTX *bnctx);
 
 /**
  * Creates a EC_GROUP object with a curve specified by a NID
@@ -486,7 +486,7 @@ OSSL_PARAM *EC_GROUP_to_params(const EC_GROUP *group, OSSL_LIB_CTX *libctx,
  *          if an error occurred
  */
 EC_GROUP *EC_GROUP_new_by_curve_name_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                                        int nid);
+    int nid);
 
 /**
  * Creates a EC_GROUP object with a curve specified by a NID. Same as
@@ -512,7 +512,7 @@ EC_GROUP *EC_GROUP_new_from_ecparameters(const ECPARAMETERS *params);
  *          if an error occurred.
  */
 ECPARAMETERS *EC_GROUP_get_ecparameters(const EC_GROUP *group,
-                                        ECPARAMETERS *params);
+    ECPARAMETERS *params);
 
 /** Creates a new EC_GROUP object from an ECPKPARAMETERS object
  *  \param  params  pointer to an existing ECPKPARAMETERS object, or NULL
@@ -528,7 +528,7 @@ EC_GROUP *EC_GROUP_new_from_ecpkparameters(const ECPKPARAMETERS *params);
  *          if an error occurred.
  */
 ECPKPARAMETERS *EC_GROUP_get_ecpkparameters(const EC_GROUP *group,
-                                            ECPKPARAMETERS *params);
+    ECPKPARAMETERS *params);
 
 /********************************************************************/
 /*               handling of internal curves                        */
@@ -550,7 +550,7 @@ size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
 const char *EC_curve_nid2nist(int nid);
 int EC_curve_nist2nid(const char *name);
 int EC_GROUP_check_named_curve(const EC_GROUP *group, int nist_only,
-                               BN_CTX *ctx);
+    BN_CTX *ctx);
 
 /********************************************************************/
 /*                    EC_POINT functions                            */
@@ -594,7 +594,7 @@ EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
  */
 int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Returns the EC_METHOD used in EC_POINT object
  *  \param  point  EC_POINT object
  *  \return the EC_METHOD used
@@ -610,10 +610,9 @@ OSSL_DEPRECATEDIN_3_0 const EC_METHOD *EC_POINT_method_of(const EC_POINT *point)
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_Jprojective_coordinates_GFp
-                      (const EC_GROUP *group, EC_POINT *p,
-                       const BIGNUM *x, const BIGNUM *y, const BIGNUM *z,
-                       BN_CTX *ctx);
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
+    const BIGNUM *x, const BIGNUM *y, const BIGNUM *z,
+    BN_CTX *ctx);
 
 /** Gets the jacobian projective coordinates of a EC_POINT over GFp
  *  \param  group  underlying EC_GROUP object
@@ -624,10 +623,9 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_Jprojective_coordinates_GFp
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_Jprojective_coordinates_GFp
-                      (const EC_GROUP *group, const EC_POINT *p,
-                       BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx);
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group, const EC_POINT *p,
+    BIGNUM *x, BIGNUM *y, BIGNUM *z, BN_CTX *ctx);
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /** Sets the affine coordinates of an EC_POINT
  *  \param  group  underlying EC_GROUP object
@@ -638,8 +636,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_Jprojective_coordinates_GFp
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *p,
-                                    const BIGNUM *x, const BIGNUM *y,
-                                    BN_CTX *ctx);
+    const BIGNUM *x, const BIGNUM *y,
+    BN_CTX *ctx);
 
 /** Gets the affine coordinates of an EC_POINT.
  *  \param  group  underlying EC_GROUP object
@@ -650,9 +648,9 @@ int EC_POINT_set_affine_coordinates(const EC_GROUP *group, EC_POINT *p,
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,
-                                    BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+    BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Sets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_set_affine_coordinates
  *  \param  group  underlying EC_GROUP object
@@ -662,9 +660,8 @@ int EC_POINT_get_affine_coordinates(const EC_GROUP *group, const EC_POINT *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_affine_coordinates_GFp
-                      (const EC_GROUP *group, EC_POINT *p,
-                       const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
+    const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
 
 /** Gets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_get_affine_coordinates
@@ -675,10 +672,9 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_affine_coordinates_GFp
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_affine_coordinates_GFp
-                      (const EC_GROUP *group, const EC_POINT *p,
-                       BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group, const EC_POINT *p,
+    BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /** Sets the x9.62 compressed coordinates of a EC_POINT
  *  \param  group  underlying EC_GROUP object
@@ -689,10 +685,10 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_affine_coordinates_GFp
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,
-                                        const BIGNUM *x, int y_bit,
-                                        BN_CTX *ctx);
+    const BIGNUM *x, int y_bit,
+    BN_CTX *ctx);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of
  *  EC_POINT_set_compressed_coordinates
  *  \param  group  underlying EC_GROUP object
@@ -702,10 +698,9 @@ int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p,
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_compressed_coordinates_GFp
-                      (const EC_GROUP *group, EC_POINT *p,
-                       const BIGNUM *x, int y_bit, BN_CTX *ctx);
-#   ifndef OPENSSL_NO_EC2M
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
+    const BIGNUM *x, int y_bit, BN_CTX *ctx);
+#ifndef OPENSSL_NO_EC2M
 /** Sets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_set_affine_coordinates
  *  \param  group  underlying EC_GROUP object
@@ -715,9 +710,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_compressed_coordinates_GFp
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_affine_coordinates_GF2m
-                      (const EC_GROUP *group, EC_POINT *p,
-                       const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
+    const BIGNUM *x, const BIGNUM *y, BN_CTX *ctx);
 
 /** Gets the affine coordinates of an EC_POINT. A synonym of
  *  EC_POINT_get_affine_coordinates
@@ -728,9 +722,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_affine_coordinates_GF2m
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_affine_coordinates_GF2m
-                      (const EC_GROUP *group, const EC_POINT *p,
-                       BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group, const EC_POINT *p,
+    BIGNUM *x, BIGNUM *y, BN_CTX *ctx);
 
 /** Sets the x9.62 compressed coordinates of a EC_POINT. A synonym of
  *  EC_POINT_set_compressed_coordinates
@@ -741,11 +734,10 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_get_affine_coordinates_GF2m
  *  \param  ctx    BN_CTX object (optional)
  *  \return 1 on success and 0 if an error occurred
  */
-OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_compressed_coordinates_GF2m
-                      (const EC_GROUP *group, EC_POINT *p,
-                       const BIGNUM *x, int y_bit, BN_CTX *ctx);
-#   endif
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
+    const BIGNUM *x, int y_bit, BN_CTX *ctx);
+#endif
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /** Encodes a EC_POINT object to a octet string
  *  \param  group  underlying EC_GROUP object
@@ -758,8 +750,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINT_set_compressed_coordinates_GF2m
  *  \return the length of the encoded octet string or 0 if an error occurred
  */
 size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
-                          point_conversion_form_t form,
-                          unsigned char *buf, size_t len, BN_CTX *ctx);
+    point_conversion_form_t form,
+    unsigned char *buf, size_t len, BN_CTX *ctx);
 
 /** Decodes a EC_POINT from a octet string
  *  \param  group  underlying EC_GROUP object
@@ -770,7 +762,7 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
-                       const unsigned char *buf, size_t len, BN_CTX *ctx);
+    const unsigned char *buf, size_t len, BN_CTX *ctx);
 
 /** Encodes an EC_POINT object to an allocated octet string
  *  \param  group  underlying EC_GROUP object
@@ -781,24 +773,24 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
  *  \return the length of the encoded octet string or 0 if an error occurred
  */
 size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point,
-                          point_conversion_form_t form,
-                          unsigned char **pbuf, BN_CTX *ctx);
+    point_conversion_form_t form,
+    unsigned char **pbuf, BN_CTX *ctx);
 
 /* other interfaces to point2oct/oct2point: */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 BIGNUM *EC_POINT_point2bn(const EC_GROUP *,
-                                                const EC_POINT *,
-                                                point_conversion_form_t form,
-                                                BIGNUM *, BN_CTX *);
+    const EC_POINT *,
+    point_conversion_form_t form,
+    BIGNUM *, BN_CTX *);
 OSSL_DEPRECATEDIN_3_0 EC_POINT *EC_POINT_bn2point(const EC_GROUP *,
-                                                  const BIGNUM *,
-                                                  EC_POINT *, BN_CTX *);
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+    const BIGNUM *,
+    EC_POINT *, BN_CTX *);
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-                         point_conversion_form_t form, BN_CTX *);
+    point_conversion_form_t form, BN_CTX *);
 EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-                             EC_POINT *, BN_CTX *);
+    EC_POINT *, BN_CTX *);
 
 /********************************************************************/
 /*         functions for doing EC_POINT arithmetic                  */
@@ -813,7 +805,7 @@ EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 const EC_POINT *b, BN_CTX *ctx);
+    const EC_POINT *b, BN_CTX *ctx);
 
 /** Computes the double of a EC_POINT
  *  \param  group  underlying EC_GROUP object
@@ -823,7 +815,7 @@ int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 BN_CTX *ctx);
+    BN_CTX *ctx);
 
 /** Computes the inverse of a EC_POINT
  *  \param  group  underlying EC_GROUP object
@@ -847,7 +839,7 @@ int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
  *  \return 1 if the point is on the curve, 0 if not, or -1 on error
  */
 int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                         BN_CTX *ctx);
+    BN_CTX *ctx);
 
 /** Compares two EC_POINTs
  *  \param  group  underlying EC_GROUP object
@@ -857,13 +849,13 @@ int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
  *  \return 1 if the points are not equal, 0 if they are, or -1 on error
  */
 int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
-                 BN_CTX *ctx);
+    BN_CTX *ctx);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int EC_POINT_make_affine(const EC_GROUP *group,
-                                               EC_POINT *point, BN_CTX *ctx);
+    EC_POINT *point, BN_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
-                                                EC_POINT *points[], BN_CTX *ctx);
+    EC_POINT *points[], BN_CTX *ctx);
 
 /** Computes r = generator * n + sum_{i=0}^{num-1} p[i] * m[i]
  *  \param  group  underlying EC_GROUP object
@@ -876,10 +868,10 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINTs_make_affine(const EC_GROUP *group, size_t nu
  *  \return 1 on success and 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r,
-                                        const BIGNUM *n, size_t num,
-                                        const EC_POINT *p[], const BIGNUM *m[],
-                                        BN_CTX *ctx);
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+    const BIGNUM *n, size_t num,
+    const EC_POINT *p[], const BIGNUM *m[],
+    BN_CTX *ctx);
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /** Computes r = generator * n + q * m
  *  \param  group  underlying EC_GROUP object
@@ -891,9 +883,9 @@ OSSL_DEPRECATEDIN_3_0 int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r,
  *  \return 1 on success and 0 if an error occurred
  */
 int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                 const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
+    const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Stores multiples of generator for faster point multiplication
  *  \param  group  EC_GROUP object
  *  \param  ctx    BN_CTX object (optional)
@@ -906,7 +898,7 @@ OSSL_DEPRECATEDIN_3_0 int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx)
  *  \return 1 if a pre-computation has been done and 0 otherwise
  */
 OSSL_DEPRECATEDIN_3_0 int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /********************************************************************/
 /*                       ASN1 stuff                                 */
@@ -922,55 +914,55 @@ DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
  * represent the field elements
  */
 int EC_GROUP_get_basis_type(const EC_GROUP *);
-#  ifndef OPENSSL_NO_EC2M
+#ifndef OPENSSL_NO_EC2M
 int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
 int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
-                                   unsigned int *k2, unsigned int *k3);
-#  endif
+    unsigned int *k2, unsigned int *k3);
+#endif
 
 EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
 int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
 
-#  define d2i_ECPKParameters_bio(bp,x) \
+#define d2i_ECPKParameters_bio(bp, x) \
     ASN1_d2i_bio_of(EC_GROUP, NULL, d2i_ECPKParameters, bp, x)
-#  define i2d_ECPKParameters_bio(bp,x) \
+#define i2d_ECPKParameters_bio(bp, x) \
     ASN1_i2d_bio_of(EC_GROUP, i2d_ECPKParameters, bp, x)
-#  define d2i_ECPKParameters_fp(fp,x) \
+#define d2i_ECPKParameters_fp(fp, x)                                       \
     (EC_GROUP *)ASN1_d2i_fp(NULL, (d2i_of_void *)d2i_ECPKParameters, (fp), \
-                            (void **)(x))
-#  define i2d_ECPKParameters_fp(fp,x) \
+        (void **)(x))
+#define i2d_ECPKParameters_fp(fp, x) \
     ASN1_i2d_fp((i2d_of_void *)i2d_ECPKParameters, (fp), (void *)(x))
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ECPKParameters_print(BIO *bp, const EC_GROUP *x,
-                                               int off);
-#   ifndef OPENSSL_NO_STDIO
+    int off);
+#ifndef OPENSSL_NO_STDIO
 OSSL_DEPRECATEDIN_3_0 int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x,
-                                                  int off);
-#   endif
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+    int off);
+#endif
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /********************************************************************/
 /*                      EC_KEY functions                            */
 /********************************************************************/
 
 /* some values for the encoding_flag */
-#  define EC_PKEY_NO_PARAMETERS   0x001
-#  define EC_PKEY_NO_PUBKEY       0x002
+#define EC_PKEY_NO_PARAMETERS 0x001
+#define EC_PKEY_NO_PUBKEY 0x002
 
 /* some values for the flags field */
-#  define EC_FLAG_SM2_RANGE              0x0004
-#  define EC_FLAG_COFACTOR_ECDH          0x1000
-#  define EC_FLAG_CHECK_NAMED_GROUP      0x2000
-#  define EC_FLAG_CHECK_NAMED_GROUP_NIST 0x4000
-#  define EC_FLAG_CHECK_NAMED_GROUP_MASK \
+#define EC_FLAG_SM2_RANGE 0x0004
+#define EC_FLAG_COFACTOR_ECDH 0x1000
+#define EC_FLAG_CHECK_NAMED_GROUP 0x2000
+#define EC_FLAG_CHECK_NAMED_GROUP_NIST 0x4000
+#define EC_FLAG_CHECK_NAMED_GROUP_MASK \
     (EC_FLAG_CHECK_NAMED_GROUP | EC_FLAG_CHECK_NAMED_GROUP_NIST)
 
 /* Deprecated flags -  it was using 0x01..0x02 */
-#  define EC_FLAG_NON_FIPS_ALLOW         0x0000
-#  define EC_FLAG_FIPS_CHECKED           0x0000
+#define EC_FLAG_NON_FIPS_ALLOW 0x0000
+#define EC_FLAG_FIPS_CHECKED 0x0000
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /**
  *  Creates a new EC_KEY object.
  *  \param  ctx  The library context for to use for this EC_KEY. May be NULL in
@@ -1004,8 +996,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_KEY_decoded_from_explicit_params(const EC_KEY *key)
  *  \return EC_KEY object or NULL if an error occurred.
  */
 OSSL_DEPRECATEDIN_3_0 EC_KEY *EC_KEY_new_by_curve_name_ex(OSSL_LIB_CTX *ctx,
-                                                          const char *propq,
-                                                          int nid);
+    const char *propq,
+    int nid);
 
 /**
  *  Creates a new EC_KEY object using a named curve as underlying
@@ -1092,13 +1084,13 @@ OSSL_DEPRECATEDIN_3_0 unsigned EC_KEY_get_enc_flags(const EC_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void EC_KEY_set_enc_flags(EC_KEY *eckey, unsigned int flags);
 OSSL_DEPRECATEDIN_3_0 point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void EC_KEY_set_conv_form(EC_KEY *eckey,
-                                                point_conversion_form_t cform);
-#  endif /*OPENSSL_NO_DEPRECATED_3_0 */
+    point_conversion_form_t cform);
+#endif /*OPENSSL_NO_DEPRECATED_3_0 */
 
-#  define EC_KEY_get_ex_new_index(l, p, newf, dupf, freef) \
+#define EC_KEY_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_EC_KEY, l, p, newf, dupf, freef)
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_set_ex_data(EC_KEY *key, int idx, void *arg);
 OSSL_DEPRECATEDIN_3_0 void *EC_KEY_get_ex_data(const EC_KEY *key, int idx);
 
@@ -1139,8 +1131,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_KEY_can_sign(const EC_KEY *eckey);
  *  \return 1 on success and 0 otherwise.
  */
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key,
-                                                                   BIGNUM *x,
-                                                                   BIGNUM *y);
+    BIGNUM *x,
+    BIGNUM *y);
 
 /** Encodes an EC_KEY public key to an allocated octet string
  *  \param  key    key to encode
@@ -1150,8 +1142,8 @@ OSSL_DEPRECATEDIN_3_0 int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key,
  *  \return the length of the encoded octet string or 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 size_t EC_KEY_key2buf(const EC_KEY *key,
-                                            point_conversion_form_t form,
-                                            unsigned char **pbuf, BN_CTX *ctx);
+    point_conversion_form_t form,
+    unsigned char **pbuf, BN_CTX *ctx);
 
 /** Decodes a EC_KEY public key from a octet string
  *  \param  key    key to decode
@@ -1162,7 +1154,7 @@ OSSL_DEPRECATEDIN_3_0 size_t EC_KEY_key2buf(const EC_KEY *key,
  */
 
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf,
-                                         size_t len, BN_CTX *ctx);
+    size_t len, BN_CTX *ctx);
 
 /** Decodes an EC_KEY private key from an octet string
  *  \param  key    key to decode
@@ -1172,7 +1164,7 @@ OSSL_DEPRECATEDIN_3_0 int EC_KEY_oct2key(EC_KEY *key, const unsigned char *buf,
  */
 
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf,
-                                          size_t len);
+    size_t len);
 
 /** Encodes a EC_KEY private key to an octet string
  *  \param  key    key to encode
@@ -1183,7 +1175,7 @@ OSSL_DEPRECATEDIN_3_0 int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf,
  */
 
 OSSL_DEPRECATEDIN_3_0 size_t EC_KEY_priv2oct(const EC_KEY *key,
-                                             unsigned char *buf, size_t len);
+    unsigned char *buf, size_t len);
 
 /** Encodes an EC_KEY private key to an allocated octet string
  *  \param  eckey  key to encode
@@ -1191,7 +1183,7 @@ OSSL_DEPRECATEDIN_3_0 size_t EC_KEY_priv2oct(const EC_KEY *key,
  *  \return the length of the encoded octet string or 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 size_t EC_KEY_priv2buf(const EC_KEY *eckey,
-                                             unsigned char **pbuf);
+    unsigned char **pbuf);
 
 /********************************************************************/
 /*        de- and encoding functions for SEC1 ECPrivateKey          */
@@ -1204,8 +1196,8 @@ OSSL_DEPRECATEDIN_3_0 size_t EC_KEY_priv2buf(const EC_KEY *eckey,
  *  \return the decoded private key or NULL if an error occurred.
  */
 OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_ECPrivateKey(EC_KEY **key,
-                                               const unsigned char **in,
-                                               long len);
+    const unsigned char **in,
+    long len);
 
 /** Encodes a private key object and stores the result in a buffer.
  *  \param  key  the EC_KEY object to encode
@@ -1214,7 +1206,7 @@ OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_ECPrivateKey(EC_KEY **key,
  *  \return 1 on success and 0 if an error occurred.
  */
 OSSL_DEPRECATEDIN_3_0 int i2d_ECPrivateKey(const EC_KEY *key,
-                                           unsigned char **out);
+    unsigned char **out);
 
 /********************************************************************/
 /*        de- and encoding functions for EC parameters              */
@@ -1228,8 +1220,8 @@ OSSL_DEPRECATEDIN_3_0 int i2d_ECPrivateKey(const EC_KEY *key,
  *          occurred.
  */
 OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_ECParameters(EC_KEY **key,
-                                               const unsigned char **in,
-                                               long len);
+    const unsigned char **in,
+    long len);
 
 /** Encodes ec parameter and stores the result in a buffer.
  *  \param  key  the EC_KEY object with ec parameters to encode
@@ -1238,7 +1230,7 @@ OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_ECParameters(EC_KEY **key,
  *  \return 1 on success and 0 if an error occurred.
  */
 OSSL_DEPRECATEDIN_3_0 int i2d_ECParameters(const EC_KEY *key,
-                                           unsigned char **out);
+    unsigned char **out);
 
 /********************************************************************/
 /*         de- and encoding functions for EC public key             */
@@ -1253,7 +1245,7 @@ OSSL_DEPRECATEDIN_3_0 int i2d_ECParameters(const EC_KEY *key,
  *          occurred.
  */
 OSSL_DEPRECATEDIN_3_0 EC_KEY *o2i_ECPublicKey(EC_KEY **key,
-                                              const unsigned char **in, long len);
+    const unsigned char **in, long len);
 
 /** Encodes an ec public key in an octet string.
  *  \param  key  the EC_KEY object with the public key
@@ -1278,7 +1270,7 @@ OSSL_DEPRECATEDIN_3_0 int ECParameters_print(BIO *bp, const EC_KEY *key);
  */
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
 
-#   ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 /** Prints out the ec parameters on human readable form.
  *  \param  fp   file descriptor to which the information is printed
  *  \param  key  EC_KEY object
@@ -1293,7 +1285,7 @@ OSSL_DEPRECATEDIN_3_0 int ECParameters_print_fp(FILE *fp, const EC_KEY *key);
  *  \return 1 on success and 0 if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
-#   endif /* OPENSSL_NO_STDIO */
+#endif /* OPENSSL_NO_STDIO */
 
 OSSL_DEPRECATEDIN_3_0 const EC_KEY_METHOD *EC_KEY_OpenSSL(void);
 OSSL_DEPRECATEDIN_3_0 const EC_KEY_METHOD *EC_KEY_get_default_method(void);
@@ -1308,17 +1300,17 @@ OSSL_DEPRECATEDIN_3_0 EC_KEY *EC_KEY_new_method(ENGINE *engine);
  *  This identifier is retained for backwards compatibility
  */
 OSSL_DEPRECATEDIN_3_0 int ECDH_KDF_X9_62(unsigned char *out, size_t outlen,
-                                         const unsigned char *Z, size_t Zlen,
-                                         const unsigned char *sinfo,
-                                         size_t sinfolen, const EVP_MD *md);
+    const unsigned char *Z, size_t Zlen,
+    const unsigned char *sinfo,
+    size_t sinfolen, const EVP_MD *md);
 
 OSSL_DEPRECATEDIN_3_0 int ECDH_compute_key(void *out, size_t outlen,
-                                           const EC_POINT *pub_key,
-                                           const EC_KEY *ecdh,
-                                           void *(*KDF)(const void *in,
-                                                        size_t inlen, void *out,
-                                                        size_t *outlen));
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+    const EC_POINT *pub_key,
+    const EC_KEY *ecdh,
+    void *(*KDF)(const void *in,
+        size_t inlen, void *out,
+        size_t *outlen));
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 typedef struct ECDSA_SIG_st ECDSA_SIG;
 
@@ -1373,7 +1365,7 @@ const BIGNUM *ECDSA_SIG_get0_s(const ECDSA_SIG *sig);
  */
 int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /** Computes the ECDSA signature of the given hash value using
  *  the supplied private key and returns the created signature.
  *  \param  dgst      pointer to the hash value
@@ -1382,7 +1374,7 @@ int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s);
  *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst,
-                                               int dgst_len, EC_KEY *eckey);
+    int dgst_len, EC_KEY *eckey);
 
 /** Computes ECDSA signature of a given hash value using the supplied
  *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
@@ -1395,8 +1387,8 @@ OSSL_DEPRECATEDIN_3_0 ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst,
  *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
  */
 OSSL_DEPRECATEDIN_3_0 ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst,
-                                                  int dgstlen, const BIGNUM *kinv,
-                                                  const BIGNUM *rp, EC_KEY *eckey);
+    int dgstlen, const BIGNUM *kinv,
+    const BIGNUM *rp, EC_KEY *eckey);
 
 /** Verifies that the supplied signature is a valid ECDSA
  *  signature of the supplied hash value using the supplied public key.
@@ -1408,7 +1400,7 @@ OSSL_DEPRECATEDIN_3_0 ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst,
  *          and -1 on error
  */
 OSSL_DEPRECATEDIN_3_0 int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
-                                          const ECDSA_SIG *sig, EC_KEY *eckey);
+    const ECDSA_SIG *sig, EC_KEY *eckey);
 
 /** Precompute parts of the signing operation
  *  \param  eckey  EC_KEY object containing a private EC key
@@ -1418,7 +1410,7 @@ OSSL_DEPRECATEDIN_3_0 int ECDSA_do_verify(const unsigned char *dgst, int dgst_le
  *  \return 1 on success and 0 otherwise
  */
 OSSL_DEPRECATEDIN_3_0 int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx,
-                                           BIGNUM **kinv, BIGNUM **rp);
+    BIGNUM **kinv, BIGNUM **rp);
 
 /** Computes ECDSA signature of a given hash value using the supplied
  *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
@@ -1431,8 +1423,8 @@ OSSL_DEPRECATEDIN_3_0 int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx,
  *  \return 1 on success and 0 otherwise
  */
 OSSL_DEPRECATEDIN_3_0 int ECDSA_sign(int type, const unsigned char *dgst,
-                                     int dgstlen, unsigned char *sig,
-                                     unsigned int *siglen, EC_KEY *eckey);
+    int dgstlen, unsigned char *sig,
+    unsigned int *siglen, EC_KEY *eckey);
 
 /** Computes ECDSA signature of a given hash value using the supplied
  *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
@@ -1448,9 +1440,9 @@ OSSL_DEPRECATEDIN_3_0 int ECDSA_sign(int type, const unsigned char *dgst,
  *  \return 1 on success and 0 otherwise
  */
 OSSL_DEPRECATEDIN_3_0 int ECDSA_sign_ex(int type, const unsigned char *dgst,
-                                        int dgstlen, unsigned char *sig,
-                                        unsigned int *siglen, const BIGNUM *kinv,
-                                        const BIGNUM *rp, EC_KEY *eckey);
+    int dgstlen, unsigned char *sig,
+    unsigned int *siglen, const BIGNUM *kinv,
+    const BIGNUM *rp, EC_KEY *eckey);
 
 /** Verifies that the given signature is valid ECDSA signature
  *  of the supplied hash value using the specified public key.
@@ -1464,8 +1456,8 @@ OSSL_DEPRECATEDIN_3_0 int ECDSA_sign_ex(int type, const unsigned char *dgst,
  *          and -1 on error
  */
 OSSL_DEPRECATEDIN_3_0 int ECDSA_verify(int type, const unsigned char *dgst,
-                                       int dgstlen, const unsigned char *sig,
-                                       int siglen, EC_KEY *eckey);
+    int dgstlen, const unsigned char *sig,
+    int siglen, EC_KEY *eckey);
 
 /** Returns the maximum length of the DER encoded signature
  *  \param  eckey  EC_KEY object
@@ -1479,110 +1471,99 @@ OSSL_DEPRECATEDIN_3_0 int ECDSA_size(const EC_KEY *eckey);
 
 OSSL_DEPRECATEDIN_3_0 EC_KEY_METHOD *EC_KEY_METHOD_new(const EC_KEY_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_free(EC_KEY_METHOD *meth);
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_init
-                      (EC_KEY_METHOD *meth,
-                       int (*init)(EC_KEY *key),
-                       void (*finish)(EC_KEY *key),
-                       int (*copy)(EC_KEY *dest, const EC_KEY *src),
-                       int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
-                       int (*set_private)(EC_KEY *key, const BIGNUM *priv_key),
-                       int (*set_public)(EC_KEY *key, const EC_POINT *pub_key));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_init(EC_KEY_METHOD *meth,
+    int (*init)(EC_KEY *key),
+    void (*finish)(EC_KEY *key),
+    int (*copy)(EC_KEY *dest, const EC_KEY *src),
+    int (*set_group)(EC_KEY *key, const EC_GROUP *grp),
+    int (*set_private)(EC_KEY *key, const BIGNUM *priv_key),
+    int (*set_public)(EC_KEY *key, const EC_POINT *pub_key));
 
 OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_keygen(EC_KEY_METHOD *meth,
-                                                    int (*keygen)(EC_KEY *key));
+    int (*keygen)(EC_KEY *key));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_compute_key
-                      (EC_KEY_METHOD *meth,
-                       int (*ckey)(unsigned char **psec, size_t *pseclen,
-                                   const EC_POINT *pub_key, const EC_KEY *ecdh));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth,
+    int (*ckey)(unsigned char **psec, size_t *pseclen,
+        const EC_POINT *pub_key, const EC_KEY *ecdh));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_sign
-                      (EC_KEY_METHOD *meth,
-                       int (*sign)(int type, const unsigned char *dgst,
-                                   int dlen, unsigned char *sig,
-                                   unsigned int *siglen,
-                                   const BIGNUM *kinv, const BIGNUM *r,
-                                   EC_KEY *eckey),
-                       int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
-                                         BIGNUM **kinvp, BIGNUM **rp),
-                       ECDSA_SIG *(*sign_sig)(const unsigned char *dgst,
-                                              int dgst_len,
-                                              const BIGNUM *in_kinv,
-                                              const BIGNUM *in_r,
-                                              EC_KEY *eckey));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_sign(EC_KEY_METHOD *meth,
+    int (*sign)(int type, const unsigned char *dgst,
+        int dlen, unsigned char *sig,
+        unsigned int *siglen,
+        const BIGNUM *kinv, const BIGNUM *r,
+        EC_KEY *eckey),
+    int (*sign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+        BIGNUM **kinvp, BIGNUM **rp),
+    ECDSA_SIG *(*sign_sig)(const unsigned char *dgst,
+        int dgst_len,
+        const BIGNUM *in_kinv,
+        const BIGNUM *in_r,
+        EC_KEY *eckey));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_verify
-                      (EC_KEY_METHOD *meth,
-                       int (*verify)(int type, const unsigned
-                                     char *dgst, int dgst_len,
-                                     const unsigned char *sigbuf,
-                                     int sig_len, EC_KEY *eckey),
-                       int (*verify_sig)(const unsigned char *dgst,
-                                         int dgst_len, const ECDSA_SIG *sig,
-                                         EC_KEY *eckey));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
+    int (*verify)(int type, const unsigned char *dgst, int dgst_len,
+        const unsigned char *sigbuf,
+        int sig_len, EC_KEY *eckey),
+    int (*verify_sig)(const unsigned char *dgst,
+        int dgst_len, const ECDSA_SIG *sig,
+        EC_KEY *eckey));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_init
-                      (const EC_KEY_METHOD *meth,
-                       int (**pinit)(EC_KEY *key),
-                       void (**pfinish)(EC_KEY *key),
-                       int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
-                       int (**pset_group)(EC_KEY *key, const EC_GROUP *grp),
-                       int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key),
-                       int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
+    int (**pinit)(EC_KEY *key),
+    void (**pfinish)(EC_KEY *key),
+    int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
+    int (**pset_group)(EC_KEY *key, const EC_GROUP *grp),
+    int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key),
+    int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_keygen
-                      (const EC_KEY_METHOD *meth, int (**pkeygen)(EC_KEY *key));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth, int (**pkeygen)(EC_KEY *key));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_compute_key
-                      (const EC_KEY_METHOD *meth,
-                       int (**pck)(unsigned char **psec,
-                       size_t *pseclen,
-                       const EC_POINT *pub_key,
-                       const EC_KEY *ecdh));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
+    int (**pck)(unsigned char **psec,
+        size_t *pseclen,
+        const EC_POINT *pub_key,
+        const EC_KEY *ecdh));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_sign
-                      (const EC_KEY_METHOD *meth,
-                       int (**psign)(int type, const unsigned char *dgst,
-                                     int dlen, unsigned char *sig,
-                                     unsigned int *siglen,
-                                     const BIGNUM *kinv, const BIGNUM *r,
-                                     EC_KEY *eckey),
-                       int (**psign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
-                                           BIGNUM **kinvp, BIGNUM **rp),
-                       ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
-                                                int dgst_len,
-                                                const BIGNUM *in_kinv,
-                                                const BIGNUM *in_r,
-                                                EC_KEY *eckey));
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
+    int (**psign)(int type, const unsigned char *dgst,
+        int dlen, unsigned char *sig,
+        unsigned int *siglen,
+        const BIGNUM *kinv, const BIGNUM *r,
+        EC_KEY *eckey),
+    int (**psign_setup)(EC_KEY *eckey, BN_CTX *ctx_in,
+        BIGNUM **kinvp, BIGNUM **rp),
+    ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
+        int dgst_len,
+        const BIGNUM *in_kinv,
+        const BIGNUM *in_r,
+        EC_KEY *eckey));
 
-OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_verify
-                      (const EC_KEY_METHOD *meth,
-                       int (**pverify)(int type, const unsigned
-                                       char *dgst, int dgst_len,
-                                       const unsigned char *sigbuf,
-                                       int sig_len, EC_KEY *eckey),
-                       int (**pverify_sig)(const unsigned char *dgst,
-                                           int dgst_len,
-                                           const ECDSA_SIG *sig,
-                                           EC_KEY *eckey));
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+OSSL_DEPRECATEDIN_3_0 void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
+    int (**pverify)(int type, const unsigned char *dgst, int dgst_len,
+        const unsigned char *sigbuf,
+        int sig_len, EC_KEY *eckey),
+    int (**pverify_sig)(const unsigned char *dgst,
+        int dgst_len,
+        const ECDSA_SIG *sig,
+        EC_KEY *eckey));
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
-#  define EVP_EC_gen(curve) \
+#define EVP_EC_gen(curve) \
     EVP_PKEY_Q_keygen(NULL, NULL, "EC", (char *)(strstr(curve, "")))
-    /* strstr is used to enable type checking for the variadic string arg */
-#  define ECParameters_dup(x) ASN1_dup_of(EC_KEY, i2d_ECParameters, \
-                                          d2i_ECParameters, x)
+/* strstr is used to enable type checking for the variadic string arg */
+#define ECParameters_dup(x) ASN1_dup_of(EC_KEY, i2d_ECParameters, \
+    d2i_ECParameters, x)
 
-#  ifndef __cplusplus
-#   if defined(__SUNPRO_C)
-#    if __SUNPRO_C >= 0x520
-#     pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#    endif
-#   endif
-#  endif
+#ifndef __cplusplus
+#if defined(__SUNPRO_C)
+#if __SUNPRO_C >= 0x520
+#pragma error_messages(default, E_ARRAY_OF_INCOMPLETE_NONAME, E_ARRAY_OF_INCOMPLETE)
+#endif
+#endif
+#endif
 
-# endif
-# ifdef  __cplusplus
+#endif
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index f15f91f6bf05..e4d26aa11151 100644
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@@ -9,96 +9,94 @@
  */
 
 #ifndef OPENSSL_ECERR_H
-# define OPENSSL_ECERR_H
-# pragma once
+#define OPENSSL_ECERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_EC
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_EC
 
 /*
  * EC reason codes.
  */
-#  define EC_R_ASN1_ERROR                                  115
-#  define EC_R_BAD_SIGNATURE                               156
-#  define EC_R_BIGNUM_OUT_OF_RANGE                         144
-#  define EC_R_BUFFER_TOO_SMALL                            100
-#  define EC_R_CANNOT_INVERT                               165
-#  define EC_R_COORDINATES_OUT_OF_RANGE                    146
-#  define EC_R_CURVE_DOES_NOT_SUPPORT_ECDH                 160
-#  define EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA                170
-#  define EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING              159
-#  define EC_R_DECODE_ERROR                                142
-#  define EC_R_DISCRIMINANT_IS_ZERO                        118
-#  define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE                119
-#  define EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED               127
-#  define EC_R_FAILED_MAKING_PUBLIC_KEY                    166
-#  define EC_R_FIELD_TOO_LARGE                             143
-#  define EC_R_GF2M_NOT_SUPPORTED                          147
-#  define EC_R_GROUP2PKPARAMETERS_FAILURE                  120
-#  define EC_R_I2D_ECPKPARAMETERS_FAILURE                  121
-#  define EC_R_INCOMPATIBLE_OBJECTS                        101
-#  define EC_R_INVALID_A                                   168
-#  define EC_R_INVALID_ARGUMENT                            112
-#  define EC_R_INVALID_B                                   169
-#  define EC_R_INVALID_COFACTOR                            171
-#  define EC_R_INVALID_COMPRESSED_POINT                    110
-#  define EC_R_INVALID_COMPRESSION_BIT                     109
-#  define EC_R_INVALID_CURVE                               141
-#  define EC_R_INVALID_DIGEST                              151
-#  define EC_R_INVALID_DIGEST_TYPE                         138
-#  define EC_R_INVALID_ENCODING                            102
-#  define EC_R_INVALID_FIELD                               103
-#  define EC_R_INVALID_FORM                                104
-#  define EC_R_INVALID_GENERATOR                           173
-#  define EC_R_INVALID_GROUP_ORDER                         122
-#  define EC_R_INVALID_KEY                                 116
-#  define EC_R_INVALID_LENGTH                              117
-#  define EC_R_INVALID_NAMED_GROUP_CONVERSION              174
-#  define EC_R_INVALID_OUTPUT_LENGTH                       161
-#  define EC_R_INVALID_P                                   172
-#  define EC_R_INVALID_PEER_KEY                            133
-#  define EC_R_INVALID_PENTANOMIAL_BASIS                   132
-#  define EC_R_INVALID_PRIVATE_KEY                         123
-#  define EC_R_INVALID_SEED                                175
-#  define EC_R_INVALID_TRINOMIAL_BASIS                     137
-#  define EC_R_KDF_PARAMETER_ERROR                         148
-#  define EC_R_KEYS_NOT_SET                                140
-#  define EC_R_LADDER_POST_FAILURE                         136
-#  define EC_R_LADDER_PRE_FAILURE                          153
-#  define EC_R_LADDER_STEP_FAILURE                         162
-#  define EC_R_MISSING_OID                                 167
-#  define EC_R_MISSING_PARAMETERS                          124
-#  define EC_R_MISSING_PRIVATE_KEY                         125
-#  define EC_R_NEED_NEW_SETUP_VALUES                       157
-#  define EC_R_NOT_A_NIST_PRIME                            135
-#  define EC_R_NOT_IMPLEMENTED                             126
-#  define EC_R_NOT_INITIALIZED                             111
-#  define EC_R_NO_PARAMETERS_SET                           139
-#  define EC_R_NO_PRIVATE_VALUE                            154
-#  define EC_R_OPERATION_NOT_SUPPORTED                     152
-#  define EC_R_PASSED_NULL_PARAMETER                       134
-#  define EC_R_PEER_KEY_ERROR                              149
-#  define EC_R_POINT_ARITHMETIC_FAILURE                    155
-#  define EC_R_POINT_AT_INFINITY                           106
-#  define EC_R_POINT_COORDINATES_BLIND_FAILURE             163
-#  define EC_R_POINT_IS_NOT_ON_CURVE                       107
-#  define EC_R_RANDOM_NUMBER_GENERATION_FAILED             158
-#  define EC_R_SHARED_INFO_ERROR                           150
-#  define EC_R_SLOT_FULL                                   108
-#  define EC_R_TOO_MANY_RETRIES                            176
-#  define EC_R_UNDEFINED_GENERATOR                         113
-#  define EC_R_UNDEFINED_ORDER                             128
-#  define EC_R_UNKNOWN_COFACTOR                            164
-#  define EC_R_UNKNOWN_GROUP                               129
-#  define EC_R_UNKNOWN_ORDER                               114
-#  define EC_R_UNSUPPORTED_FIELD                           131
-#  define EC_R_WRONG_CURVE_PARAMETERS                      145
-#  define EC_R_WRONG_ORDER                                 130
+#define EC_R_ASN1_ERROR 115
+#define EC_R_BAD_SIGNATURE 156
+#define EC_R_BIGNUM_OUT_OF_RANGE 144
+#define EC_R_BUFFER_TOO_SMALL 100
+#define EC_R_CANNOT_INVERT 165
+#define EC_R_COORDINATES_OUT_OF_RANGE 146
+#define EC_R_CURVE_DOES_NOT_SUPPORT_ECDH 160
+#define EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA 170
+#define EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING 159
+#define EC_R_DECODE_ERROR 142
+#define EC_R_DISCRIMINANT_IS_ZERO 118
+#define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE 119
+#define EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED 127
+#define EC_R_FAILED_MAKING_PUBLIC_KEY 166
+#define EC_R_FIELD_TOO_LARGE 143
+#define EC_R_GF2M_NOT_SUPPORTED 147
+#define EC_R_GROUP2PKPARAMETERS_FAILURE 120
+#define EC_R_I2D_ECPKPARAMETERS_FAILURE 121
+#define EC_R_INCOMPATIBLE_OBJECTS 101
+#define EC_R_INVALID_A 168
+#define EC_R_INVALID_ARGUMENT 112
+#define EC_R_INVALID_B 169
+#define EC_R_INVALID_COFACTOR 171
+#define EC_R_INVALID_COMPRESSED_POINT 110
+#define EC_R_INVALID_COMPRESSION_BIT 109
+#define EC_R_INVALID_CURVE 141
+#define EC_R_INVALID_DIGEST 151
+#define EC_R_INVALID_DIGEST_TYPE 138
+#define EC_R_INVALID_ENCODING 102
+#define EC_R_INVALID_FIELD 103
+#define EC_R_INVALID_FORM 104
+#define EC_R_INVALID_GENERATOR 173
+#define EC_R_INVALID_GROUP_ORDER 122
+#define EC_R_INVALID_KEY 116
+#define EC_R_INVALID_LENGTH 117
+#define EC_R_INVALID_NAMED_GROUP_CONVERSION 174
+#define EC_R_INVALID_OUTPUT_LENGTH 161
+#define EC_R_INVALID_P 172
+#define EC_R_INVALID_PEER_KEY 133
+#define EC_R_INVALID_PENTANOMIAL_BASIS 132
+#define EC_R_INVALID_PRIVATE_KEY 123
+#define EC_R_INVALID_SEED 175
+#define EC_R_INVALID_TRINOMIAL_BASIS 137
+#define EC_R_KDF_PARAMETER_ERROR 148
+#define EC_R_KEYS_NOT_SET 140
+#define EC_R_LADDER_POST_FAILURE 136
+#define EC_R_LADDER_PRE_FAILURE 153
+#define EC_R_LADDER_STEP_FAILURE 162
+#define EC_R_MISSING_OID 167
+#define EC_R_MISSING_PARAMETERS 124
+#define EC_R_MISSING_PRIVATE_KEY 125
+#define EC_R_NEED_NEW_SETUP_VALUES 157
+#define EC_R_NOT_A_NIST_PRIME 135
+#define EC_R_NOT_IMPLEMENTED 126
+#define EC_R_NOT_INITIALIZED 111
+#define EC_R_NO_PARAMETERS_SET 139
+#define EC_R_NO_PRIVATE_VALUE 154
+#define EC_R_OPERATION_NOT_SUPPORTED 152
+#define EC_R_PASSED_NULL_PARAMETER 134
+#define EC_R_PEER_KEY_ERROR 149
+#define EC_R_POINT_ARITHMETIC_FAILURE 155
+#define EC_R_POINT_AT_INFINITY 106
+#define EC_R_POINT_COORDINATES_BLIND_FAILURE 163
+#define EC_R_POINT_IS_NOT_ON_CURVE 107
+#define EC_R_RANDOM_NUMBER_GENERATION_FAILED 158
+#define EC_R_SHARED_INFO_ERROR 150
+#define EC_R_SLOT_FULL 108
+#define EC_R_TOO_MANY_RETRIES 176
+#define EC_R_UNDEFINED_GENERATOR 113
+#define EC_R_UNDEFINED_ORDER 128
+#define EC_R_UNKNOWN_COFACTOR 164
+#define EC_R_UNKNOWN_GROUP 129
+#define EC_R_UNKNOWN_ORDER 114
+#define EC_R_UNSUPPORTED_FIELD 131
+#define EC_R_WRONG_CURVE_PARAMETERS 145
+#define EC_R_WRONG_ORDER 130
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/encoder.h b/include/openssl/encoder.h
index c37a6f16f23c..9138c07276b6 100644
--- a/include/openssl/encoder.h
+++ b/include/openssl/encoder.h
@@ -8,26 +8,26 @@
  */
 
 #ifndef OPENSSL_ENCODER_H
-# define OPENSSL_ENCODER_H
-# pragma once
+#define OPENSSL_ENCODER_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# include <stdarg.h>
-# include <stddef.h>
-# include <openssl/encodererr.h>
-# include <openssl/types.h>
-# include <openssl/core.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#include <stdarg.h>
+#include <stddef.h>
+#include <openssl/encodererr.h>
+#include <openssl/types.h>
+#include <openssl/core.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 OSSL_ENCODER *OSSL_ENCODER_fetch(OSSL_LIB_CTX *libctx, const char *name,
-                                 const char *properties);
+    const char *properties);
 int OSSL_ENCODER_up_ref(OSSL_ENCODER *encoder);
 void OSSL_ENCODER_free(OSSL_ENCODER *encoder);
 
@@ -38,44 +38,44 @@ const char *OSSL_ENCODER_get0_description(const OSSL_ENCODER *kdf);
 int OSSL_ENCODER_is_a(const OSSL_ENCODER *encoder, const char *name);
 
 void OSSL_ENCODER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                  void (*fn)(OSSL_ENCODER *encoder, void *arg),
-                                  void *arg);
+    void (*fn)(OSSL_ENCODER *encoder, void *arg),
+    void *arg);
 int OSSL_ENCODER_names_do_all(const OSSL_ENCODER *encoder,
-                              void (*fn)(const char *name, void *data),
-                              void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *OSSL_ENCODER_gettable_params(OSSL_ENCODER *encoder);
 int OSSL_ENCODER_get_params(OSSL_ENCODER *encoder, OSSL_PARAM params[]);
 
 const OSSL_PARAM *OSSL_ENCODER_settable_ctx_params(OSSL_ENCODER *encoder);
 OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new(void);
 int OSSL_ENCODER_CTX_set_params(OSSL_ENCODER_CTX *ctx,
-                                const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 void OSSL_ENCODER_CTX_free(OSSL_ENCODER_CTX *ctx);
 
 /* Utilities that help set specific parameters */
 int OSSL_ENCODER_CTX_set_passphrase(OSSL_ENCODER_CTX *ctx,
-                                    const unsigned char *kstr, size_t klen);
+    const unsigned char *kstr, size_t klen);
 int OSSL_ENCODER_CTX_set_pem_password_cb(OSSL_ENCODER_CTX *ctx,
-                                         pem_password_cb *cb, void *cbarg);
+    pem_password_cb *cb, void *cbarg);
 int OSSL_ENCODER_CTX_set_passphrase_cb(OSSL_ENCODER_CTX *ctx,
-                                       OSSL_PASSPHRASE_CALLBACK *cb,
-                                       void *cbarg);
+    OSSL_PASSPHRASE_CALLBACK *cb,
+    void *cbarg);
 int OSSL_ENCODER_CTX_set_passphrase_ui(OSSL_ENCODER_CTX *ctx,
-                                       const UI_METHOD *ui_method,
-                                       void *ui_data);
+    const UI_METHOD *ui_method,
+    void *ui_data);
 int OSSL_ENCODER_CTX_set_cipher(OSSL_ENCODER_CTX *ctx,
-                                const char *cipher_name,
-                                const char *propquery);
+    const char *cipher_name,
+    const char *propquery);
 int OSSL_ENCODER_CTX_set_selection(OSSL_ENCODER_CTX *ctx, int selection);
 int OSSL_ENCODER_CTX_set_output_type(OSSL_ENCODER_CTX *ctx,
-                                     const char *output_type);
+    const char *output_type);
 int OSSL_ENCODER_CTX_set_output_structure(OSSL_ENCODER_CTX *ctx,
-                                          const char *output_structure);
+    const char *output_structure);
 
 /* Utilities to add encoders */
 int OSSL_ENCODER_CTX_add_encoder(OSSL_ENCODER_CTX *ctx, OSSL_ENCODER *encoder);
 int OSSL_ENCODER_CTX_add_extra(OSSL_ENCODER_CTX *ctx,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OSSL_ENCODER_CTX_get_num_encoders(OSSL_ENCODER_CTX *ctx);
 
 typedef struct ossl_encoder_instance_st OSSL_ENCODER_INSTANCE;
@@ -89,15 +89,15 @@ const char *
 OSSL_ENCODER_INSTANCE_get_output_structure(OSSL_ENCODER_INSTANCE *encoder_inst);
 
 typedef const void *OSSL_ENCODER_CONSTRUCT(OSSL_ENCODER_INSTANCE *encoder_inst,
-                                           void *construct_data);
+    void *construct_data);
 typedef void OSSL_ENCODER_CLEANUP(void *construct_data);
 
 int OSSL_ENCODER_CTX_set_construct(OSSL_ENCODER_CTX *ctx,
-                                   OSSL_ENCODER_CONSTRUCT *construct);
+    OSSL_ENCODER_CONSTRUCT *construct);
 int OSSL_ENCODER_CTX_set_construct_data(OSSL_ENCODER_CTX *ctx,
-                                        void *construct_data);
+    void *construct_data);
 int OSSL_ENCODER_CTX_set_cleanup(OSSL_ENCODER_CTX *ctx,
-                                 OSSL_ENCODER_CLEANUP *cleanup);
+    OSSL_ENCODER_CLEANUP *cleanup);
 
 /* Utilities to output the object to encode */
 int OSSL_ENCODER_to_bio(OSSL_ENCODER_CTX *ctx, BIO *out);
@@ -105,7 +105,7 @@ int OSSL_ENCODER_to_bio(OSSL_ENCODER_CTX *ctx, BIO *out);
 int OSSL_ENCODER_to_fp(OSSL_ENCODER_CTX *ctx, FILE *fp);
 #endif
 int OSSL_ENCODER_to_data(OSSL_ENCODER_CTX *ctx, unsigned char **pdata,
-                         size_t *pdata_len);
+    size_t *pdata_len);
 
 /*
  * Create the OSSL_ENCODER_CTX with an associated type.  This will perform
@@ -113,12 +113,12 @@ int OSSL_ENCODER_to_data(OSSL_ENCODER_CTX *ctx, unsigned char **pdata,
  * This is more useful than calling OSSL_ENCODER_CTX_new().
  */
 OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey,
-                                                int selection,
-                                                const char *output_type,
-                                                const char *output_struct,
-                                                const char *propquery);
+    int selection,
+    const char *output_type,
+    const char *output_struct,
+    const char *propquery);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/encodererr.h b/include/openssl/encodererr.h
index 5e318b145370..e07174c3acd2 100644
--- a/include/openssl/encodererr.h
+++ b/include/openssl/encodererr.h
@@ -9,20 +9,18 @@
  */
 
 #ifndef OPENSSL_ENCODERERR_H
-# define OPENSSL_ENCODERERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_ENCODERERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * OSSL_ENCODER reason codes.
  */
-# define OSSL_ENCODER_R_ENCODER_NOT_FOUND                 101
-# define OSSL_ENCODER_R_INCORRECT_PROPERTY_QUERY          100
-# define OSSL_ENCODER_R_MISSING_GET_PARAMS                102
+#define OSSL_ENCODER_R_ENCODER_NOT_FOUND 101
+#define OSSL_ENCODER_R_INCORRECT_PROPERTY_QUERY 100
+#define OSSL_ENCODER_R_MISSING_GET_PARAMS 102
 
 #endif
diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 5b4b504be7db..73f6d86aaf70 100644
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -9,51 +9,51 @@
  */
 
 #ifndef OPENSSL_ENGINE_H
-# define OPENSSL_ENGINE_H
-# pragma once
+#define OPENSSL_ENGINE_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ENGINE_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ENGINE_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_ENGINE
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   include <openssl/bn.h>
-#   include <openssl/rsa.h>
-#   include <openssl/dsa.h>
-#   include <openssl/dh.h>
-#   include <openssl/ec.h>
-#   include <openssl/rand.h>
-#   include <openssl/ui.h>
-#   include <openssl/err.h>
-#  endif
-#  include <openssl/types.h>
-#  include <openssl/symhacks.h>
-#  include <openssl/x509.h>
-#  include <openssl/engineerr.h>
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#include <openssl/ec.h>
+#include <openssl/rand.h>
+#include <openssl/ui.h>
+#include <openssl/err.h>
+#endif
+#include <openssl/types.h>
+#include <openssl/symhacks.h>
+#include <openssl/x509.h>
+#include <openssl/engineerr.h>
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
 /*
  * These flags are used to control combinations of algorithm (methods) by
  * bitwise "OR"ing.
  */
-#  define ENGINE_METHOD_RSA               (unsigned int)0x0001
-#  define ENGINE_METHOD_DSA               (unsigned int)0x0002
-#  define ENGINE_METHOD_DH                (unsigned int)0x0004
-#  define ENGINE_METHOD_RAND              (unsigned int)0x0008
-#  define ENGINE_METHOD_CIPHERS           (unsigned int)0x0040
-#  define ENGINE_METHOD_DIGESTS           (unsigned int)0x0080
-#  define ENGINE_METHOD_PKEY_METHS        (unsigned int)0x0200
-#  define ENGINE_METHOD_PKEY_ASN1_METHS   (unsigned int)0x0400
-#  define ENGINE_METHOD_EC                (unsigned int)0x0800
+#define ENGINE_METHOD_RSA (unsigned int)0x0001
+#define ENGINE_METHOD_DSA (unsigned int)0x0002
+#define ENGINE_METHOD_DH (unsigned int)0x0004
+#define ENGINE_METHOD_RAND (unsigned int)0x0008
+#define ENGINE_METHOD_CIPHERS (unsigned int)0x0040
+#define ENGINE_METHOD_DIGESTS (unsigned int)0x0080
+#define ENGINE_METHOD_PKEY_METHS (unsigned int)0x0200
+#define ENGINE_METHOD_PKEY_ASN1_METHS (unsigned int)0x0400
+#define ENGINE_METHOD_EC (unsigned int)0x0800
 /* Obvious all-or-nothing cases. */
-#  define ENGINE_METHOD_ALL               (unsigned int)0xFFFF
-#  define ENGINE_METHOD_NONE              (unsigned int)0x0000
+#define ENGINE_METHOD_ALL (unsigned int)0xFFFF
+#define ENGINE_METHOD_NONE (unsigned int)0x0000
 
 /*
  * This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
@@ -61,7 +61,7 @@ extern "C" {
  * set by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
  * initialise registered ENGINEs if they are not already initialised.
  */
-#  define ENGINE_TABLE_FLAG_NOINIT        (unsigned int)0x0001
+#define ENGINE_TABLE_FLAG_NOINIT (unsigned int)0x0001
 
 /* ENGINE flags that can be set by ENGINE_set_flags(). */
 /* Not used */
@@ -73,7 +73,7 @@ extern "C" {
  * these control commands on behalf of the ENGINE using their "cmd_defns"
  * data.
  */
-#  define ENGINE_FLAGS_MANUAL_CMD_CTRL    (int)0x0002
+#define ENGINE_FLAGS_MANUAL_CMD_CTRL (int)0x0002
 
 /*
  * This flag is for ENGINEs who return new duplicate structures when found
@@ -85,7 +85,7 @@ extern "C" {
  * ENGINE_by_id() just increments the existing ENGINE's structural reference
  * count.
  */
-#  define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
+#define ENGINE_FLAGS_BY_ID_COPY (int)0x0004
 
 /*
  * This flag is for an ENGINE that does not want its methods registered as
@@ -93,7 +93,7 @@ extern "C" {
  * usable as default methods.
  */
 
-#  define ENGINE_FLAGS_NO_REGISTER_ALL    (int)0x0008
+#define ENGINE_FLAGS_NO_REGISTER_ALL (int)0x0008
 
 /*
  * ENGINEs can support their own command types, and these flags are used in
@@ -108,23 +108,23 @@ extern "C" {
  */
 
 /* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-#  define ENGINE_CMD_FLAG_NUMERIC         (unsigned int)0x0001
+#define ENGINE_CMD_FLAG_NUMERIC (unsigned int)0x0001
 /*
  * accepts string input (cast from 'void*' to 'const char *', 4th parameter
  * to ENGINE_ctrl)
  */
-#  define ENGINE_CMD_FLAG_STRING          (unsigned int)0x0002
+#define ENGINE_CMD_FLAG_STRING (unsigned int)0x0002
 /*
  * Indicates that the control command takes *no* input. Ie. the control
  * command is unparameterised.
  */
-#  define ENGINE_CMD_FLAG_NO_INPUT        (unsigned int)0x0004
+#define ENGINE_CMD_FLAG_NO_INPUT (unsigned int)0x0004
 /*
  * Indicates that the control command is internal. This control command won't
  * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
  * function.
  */
-#  define ENGINE_CMD_FLAG_INTERNAL        (unsigned int)0x0008
+#define ENGINE_CMD_FLAG_INTERNAL (unsigned int)0x0008
 
 /*
  * NB: These 3 control commands are deprecated and should not be used.
@@ -143,23 +143,23 @@ extern "C" {
  * sense to some engines.  In such a case, they do nothing but return the
  * error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED.
  */
-#  define ENGINE_CTRL_SET_LOGSTREAM               1
-#  define ENGINE_CTRL_SET_PASSWORD_CALLBACK       2
-#  define ENGINE_CTRL_HUP                         3/* Close and reinitialise
-                                                   * any handles/connections
-                                                   * etc. */
-#  define ENGINE_CTRL_SET_USER_INTERFACE          4/* Alternative to callback */
-#  define ENGINE_CTRL_SET_CALLBACK_DATA           5/* User-specific data, used
-                                                   * when calling the password
-                                                   * callback and the user
-                                                   * interface */
-#  define ENGINE_CTRL_LOAD_CONFIGURATION          6/* Load a configuration,
-                                                   * given a string that
-                                                   * represents a file name
-                                                   * or so */
-#  define ENGINE_CTRL_LOAD_SECTION                7/* Load data from a given
-                                                   * section in the already
-                                                   * loaded configuration */
+#define ENGINE_CTRL_SET_LOGSTREAM 1
+#define ENGINE_CTRL_SET_PASSWORD_CALLBACK 2
+#define ENGINE_CTRL_HUP 3 /* Close and reinitialise  \
+                           * any handles/connections \
+                           * etc. */
+#define ENGINE_CTRL_SET_USER_INTERFACE 4 /* Alternative to callback */
+#define ENGINE_CTRL_SET_CALLBACK_DATA 5 /* User-specific data, used  \
+                                         * when calling the password \
+                                         * callback and the user     \
+                                         * interface */
+#define ENGINE_CTRL_LOAD_CONFIGURATION 6 /* Load a configuration,  \
+                                          * given a string that    \
+                                          * represents a file name \
+                                          * or so */
+#define ENGINE_CTRL_LOAD_SECTION 7 /* Load data from a given \
+                                    * section in the already \
+                                    * loaded configuration */
 
 /*
  * These control commands allow an application to deal with an arbitrary
@@ -181,22 +181,22 @@ extern "C" {
  * worth checking this first if the caller is trying to "discover" the
  * engine's capabilities and doesn't want errors generated unnecessarily.
  */
-#  define ENGINE_CTRL_HAS_CTRL_FUNCTION           10
+#define ENGINE_CTRL_HAS_CTRL_FUNCTION 10
 /*
  * Returns a positive command number for the first command supported by the
  * engine. Returns zero if no ctrl commands are supported.
  */
-#  define ENGINE_CTRL_GET_FIRST_CMD_TYPE          11
+#define ENGINE_CTRL_GET_FIRST_CMD_TYPE 11
 /*
  * The 'long' argument specifies a command implemented by the engine, and the
  * return value is the next command supported, or zero if there are no more.
  */
-#  define ENGINE_CTRL_GET_NEXT_CMD_TYPE           12
+#define ENGINE_CTRL_GET_NEXT_CMD_TYPE 12
 /*
  * The 'void*' argument is a command name (cast from 'const char *'), and the
  * return value is the command that corresponds to it.
  */
-#  define ENGINE_CTRL_GET_CMD_FROM_NAME           13
+#define ENGINE_CTRL_GET_CMD_FROM_NAME 13
 /*
  * The next two allow a command to be converted into its corresponding string
  * form. In each case, the 'long' argument supplies the command. In the
@@ -205,23 +205,23 @@ extern "C" {
  * string buffer large enough, and it will be populated with the name of the
  * command (WITH a trailing EOL).
  */
-#  define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD       14
-#  define ENGINE_CTRL_GET_NAME_FROM_CMD           15
+#define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD 14
+#define ENGINE_CTRL_GET_NAME_FROM_CMD 15
 /* The next two are similar but give a "short description" of a command. */
-#  define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD       16
-#  define ENGINE_CTRL_GET_DESC_FROM_CMD           17
+#define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD 16
+#define ENGINE_CTRL_GET_DESC_FROM_CMD 17
 /*
  * With this command, the return value is the OR'd combination of
  * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
  * engine-specific ctrl command expects.
  */
-#  define ENGINE_CTRL_GET_CMD_FLAGS               18
+#define ENGINE_CTRL_GET_CMD_FLAGS 18
 
 /*
  * ENGINE implementations should start the numbering of their own control
  * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc).
  */
-#  define ENGINE_CMD_BASE                         200
+#define ENGINE_CMD_BASE 200
 
 /*
  * NB: These 2 nCipher "chil" control commands are deprecated, and their
@@ -232,17 +232,17 @@ extern "C" {
  */
 
 /* Flags specific to the nCipher "chil" engine */
-#  define ENGINE_CTRL_CHIL_SET_FORKCHECK          100
-         /*
-          * Depending on the value of the (long)i argument, this sets or
-          * unsets the SimpleForkCheck flag in the CHIL API to enable or
-          * disable checking and workarounds for applications that fork().
-          */
-#  define ENGINE_CTRL_CHIL_NO_LOCKING             101
-         /*
-          * This prevents the initialisation function from providing mutex
-          * callbacks to the nCipher library.
-          */
+#define ENGINE_CTRL_CHIL_SET_FORKCHECK 100
+/*
+ * Depending on the value of the (long)i argument, this sets or
+ * unsets the SimpleForkCheck flag in the CHIL API to enable or
+ * disable checking and workarounds for applications that fork().
+ */
+#define ENGINE_CTRL_CHIL_NO_LOCKING 101
+/*
+ * This prevents the initialisation function from providing mutex
+ * callbacks to the nCipher library.
+ */
 
 /*
  * If an ENGINE supports its own specific control commands and wishes the
@@ -255,29 +255,29 @@ extern "C" {
  * has cmd_num set to zero and/or cmd_name set to NULL.
  */
 typedef struct ENGINE_CMD_DEFN_st {
-    unsigned int cmd_num;       /* The command number */
-    const char *cmd_name;       /* The command name itself */
-    const char *cmd_desc;       /* A short description of the command */
-    unsigned int cmd_flags;     /* The input the command expects */
+    unsigned int cmd_num; /* The command number */
+    const char *cmd_name; /* The command name itself */
+    const char *cmd_desc; /* A short description of the command */
+    unsigned int cmd_flags; /* The input the command expects */
 } ENGINE_CMD_DEFN;
 
 /* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR) (void);
+typedef int (*ENGINE_GEN_FUNC_PTR)(void);
 /* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR) (ENGINE *);
+typedef int (*ENGINE_GEN_INT_FUNC_PTR)(ENGINE *);
 /* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR) (ENGINE *, int, long, void *,
-                                     void (*f) (void));
+typedef int (*ENGINE_CTRL_FUNC_PTR)(ENGINE *, int, long, void *,
+    void (*f)(void));
 /* Generic load_key function pointer */
 typedef EVP_PKEY *(*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-                                         UI_METHOD *ui_method,
-                                         void *callback_data);
-typedef int (*ENGINE_SSL_CLIENT_CERT_PTR) (ENGINE *, SSL *ssl,
-                                           STACK_OF(X509_NAME) *ca_dn,
-                                           X509 **pcert, EVP_PKEY **pkey,
-                                           STACK_OF(X509) **pother,
-                                           UI_METHOD *ui_method,
-                                           void *callback_data);
+    UI_METHOD *ui_method,
+    void *callback_data);
+typedef int (*ENGINE_SSL_CLIENT_CERT_PTR)(ENGINE *, SSL *ssl,
+    STACK_OF(X509_NAME) *ca_dn,
+    X509 **pcert, EVP_PKEY **pkey,
+    STACK_OF(X509) **pother,
+    UI_METHOD *ui_method,
+    void *callback_data);
 /*-
  * These callback types are for an ENGINE's handler for cipher and digest logic.
  * These handlers have these prototypes;
@@ -293,14 +293,14 @@ typedef int (*ENGINE_SSL_CLIENT_CERT_PTR) (ENGINE *, SSL *ssl,
  * Returns to a pointer to the array of supported cipher 'nid's. If the
  * second parameter is non-NULL it is set to the size of the returned array.
  */
-typedef int (*ENGINE_CIPHERS_PTR) (ENGINE *, const EVP_CIPHER **,
-                                   const int **, int);
-typedef int (*ENGINE_DIGESTS_PTR) (ENGINE *, const EVP_MD **, const int **,
-                                   int);
-typedef int (*ENGINE_PKEY_METHS_PTR) (ENGINE *, EVP_PKEY_METHOD **,
-                                      const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR) (ENGINE *, EVP_PKEY_ASN1_METHOD **,
-                                           const int **, int);
+typedef int (*ENGINE_CIPHERS_PTR)(ENGINE *, const EVP_CIPHER **,
+    const int **, int);
+typedef int (*ENGINE_DIGESTS_PTR)(ENGINE *, const EVP_MD **, const int **,
+    int);
+typedef int (*ENGINE_PKEY_METHS_PTR)(ENGINE *, EVP_PKEY_METHOD **,
+    const int **, int);
+typedef int (*ENGINE_PKEY_ASN1_METHS_PTR)(ENGINE *, EVP_PKEY_ASN1_METHOD **,
+    const int **, int);
 /*
  * STRUCTURE functions ... all of these functions deal with pointers to
  * ENGINE structures where the pointers have a "structural reference". This
@@ -314,58 +314,58 @@ typedef int (*ENGINE_PKEY_ASN1_METHS_PTR) (ENGINE *, EVP_PKEY_ASN1_METHOD **,
  */
 
 /* Get the first/last "ENGINE" type available. */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_first(void);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_last(void);
-#  endif
+#endif
 /* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_next(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_prev(ENGINE *e);
-#  endif
+#endif
 /* Add another "ENGINE" type into the array. */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_add(ENGINE *e);
-#  endif
+#endif
 /* Remove an existing "ENGINE" type from the array. */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_remove(ENGINE *e);
-#  endif
+#endif
 /* Retrieve an engine from the list by its unique "id" value. */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_by_id(const char *id);
-#  endif
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   define ENGINE_load_openssl() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_OPENSSL, NULL)
-#   define ENGINE_load_dynamic() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL)
-#   ifndef OPENSSL_NO_STATIC_ENGINE
-#    define ENGINE_load_padlock() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
-#    define ENGINE_load_capi() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
-#    define ENGINE_load_afalg() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
-#   endif
-#   define ENGINE_load_cryptodev() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL)
-#   define ENGINE_load_rdrand() \
-        OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL)
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define ENGINE_load_openssl() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_OPENSSL, NULL)
+#define ENGINE_load_dynamic() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL)
+#ifndef OPENSSL_NO_STATIC_ENGINE
+#define ENGINE_load_padlock() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
+#define ENGINE_load_capi() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
+#define ENGINE_load_afalg() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
+#endif
+#define ENGINE_load_cryptodev() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CRYPTODEV, NULL)
+#define ENGINE_load_rdrand() \
+    OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_RDRAND, NULL)
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 void ENGINE_load_builtin_engines(void);
-#  endif
+#endif
 
 /*
  * Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
  * "registry" handling.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 unsigned int ENGINE_get_table_flags(void);
 OSSL_DEPRECATEDIN_3_0 void ENGINE_set_table_flags(unsigned int flags);
-#  endif
+#endif
 
 /*- Manage registration of ENGINEs per "table". For each type, there are 3
  * functions;
@@ -374,7 +374,7 @@ OSSL_DEPRECATEDIN_3_0 void ENGINE_set_table_flags(unsigned int flags);
  *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list
  * Cleanup is automatically registered from each table when required.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_register_RSA(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_RSA(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_RSA(void);
@@ -402,7 +402,7 @@ OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_meths(void);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_register_pkey_asn1_meths(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_asn1_meths(void);
-#  endif
+#endif
 
 /*
  * These functions register all support from the above categories. Note, use
@@ -410,10 +410,10 @@ OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_asn1_meths(void);
  * may not need. If you only need a subset of functionality, consider using
  * more selective initialisation.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_register_complete(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_register_all_complete(void);
-#  endif
+#endif
 
 /*
  * Send parameterised control commands to the engine. The possibilities to
@@ -425,10 +425,10 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_register_all_complete(void);
  * commands that require an operational ENGINE, and only use functional
  * references in such situations.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p,
-                                      void (*f) (void));
-#  endif
+    void (*f)(void));
+#endif
 
 /*
  * This function tests if an ENGINE-specific command is usable as a
@@ -436,9 +436,9 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p,
  * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
  * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl().
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
-#  endif
+#endif
 
 /*
  * This function works like ENGINE_ctrl() with the exception of taking a
@@ -446,11 +446,11 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
  * commands. See the comment on ENGINE_ctrl_cmd_string() for an explanation
  * on how to use the cmd_name and cmd_optional.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-                                          long i, void *p, void (*f) (void),
-                                          int cmd_optional);
-#  endif
+    long i, void *p, void (*f)(void),
+    int cmd_optional);
+#endif
 
 /*
  * This function passes a command-name and argument to an ENGINE. The
@@ -474,11 +474,11 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
  * applications can work consistently with the same configuration for the
  * same ENGINE-enabled devices, across applications.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                           int cmd_optional);
-#  endif
+    int cmd_optional);
+#endif
 
 /*
  * These functions are useful for manufacturing new ENGINE structures. They
@@ -488,7 +488,7 @@ int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
  * These are also here so that the ENGINE structure doesn't have to be
  * exposed and break binary compatibility!
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_new(void);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_free(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_up_ref(ENGINE *e);
@@ -500,7 +500,7 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ecdsa_me
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
 OSSL_DEPRECATEDIN_3_0
-int ENGINE_set_destroy_function(ENGINE *e,ENGINE_GEN_INT_FUNC_PTR destroy_f);
+int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
 OSSL_DEPRECATEDIN_3_0
 int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
 OSSL_DEPRECATEDIN_3_0
@@ -513,7 +513,7 @@ OSSL_DEPRECATEDIN_3_0
 int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
 OSSL_DEPRECATEDIN_3_0
 int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                             ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
+    ENGINE_SSL_CLIENT_CERT_PTR loadssl_f);
 OSSL_DEPRECATEDIN_3_0
 int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
 OSSL_DEPRECATEDIN_3_0
@@ -524,23 +524,25 @@ OSSL_DEPRECATEDIN_3_0
 int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_flags(ENGINE *e, int flags);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_cmd_defns(ENGINE *e,
-                                               const ENGINE_CMD_DEFN *defns);
-#  endif
+    const ENGINE_CMD_DEFN *defns);
+#endif
 /* These functions allow control over any per-structure ENGINE data. */
-#  define ENGINE_get_ex_new_index(l, p, newf, dupf, freef) \
+#define ENGINE_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ENGINE, l, p, newf, dupf, freef)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
 OSSL_DEPRECATEDIN_3_0 void *ENGINE_get_ex_data(const ENGINE *e, int idx);
-# endif
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /*
  * This function previously cleaned up anything that needs it. Auto-deinit will
  * now take care of it so it is no longer required to call this function.
  */
-#   define ENGINE_cleanup() while(0) continue
-#  endif
+#define ENGINE_cleanup() \
+    while (0)            \
+    continue
+#endif
 
 /*
  * These return values from within the ENGINE structure. These can be useful
@@ -548,7 +550,7 @@ OSSL_DEPRECATEDIN_3_0 void *ENGINE_get_ex_data(const ENGINE *e, int idx);
  * which you obtained. Using the result for functional purposes if you only
  * obtained a structural reference may be problematic!
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *ENGINE_get_id(const ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 const char *ENGINE_get_name(const ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
@@ -588,15 +590,15 @@ OSSL_DEPRECATEDIN_3_0
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
 OSSL_DEPRECATEDIN_3_0
 const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                                          const char *str,
-                                                          int len);
+    const char *str,
+    int len);
 OSSL_DEPRECATEDIN_3_0
 const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                                      const char *str, int len);
+    const char *str, int len);
 OSSL_DEPRECATEDIN_3_0
 const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_get_flags(const ENGINE *e);
-#  endif
+#endif
 
 /*
  * FUNCTIONAL functions. These functions deal with ENGINE structures that
@@ -616,36 +618,36 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_get_flags(const ENGINE *e);
  * already in use). This will fail if the engine is not currently operational
  * and cannot initialise.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_init(ENGINE *e);
-#  endif
+#endif
 /*
  * Free a functional reference to an engine type. This does not require a
  * corresponding call to ENGINE_free as it also releases a structural
  * reference.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_finish(ENGINE *e);
-#  endif
+#endif
 
 /*
  * The following functions handle keys that are stored in some secondary
  * location, handled by the engine.  The storage may be on a card or
  * whatever.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-                                  UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 OSSL_DEPRECATEDIN_3_0
 EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-                                 UI_METHOD *ui_method, void *callback_data);
+    UI_METHOD *ui_method, void *callback_data);
 OSSL_DEPRECATEDIN_3_0
 int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s, STACK_OF(X509_NAME) *ca_dn,
-                                X509 **pcert, EVP_PKEY **ppkey,
-                                STACK_OF(X509) **pother,
-                                UI_METHOD *ui_method, void *callback_data);
-#  endif
+    X509 **pcert, EVP_PKEY **ppkey,
+    STACK_OF(X509) **pother,
+    UI_METHOD *ui_method, void *callback_data);
+#endif
 
 /*
  * This returns a pointer for the current ENGINE structure that is (by
@@ -653,26 +655,26 @@ int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s, STACK_OF(X509_NAME) *ca_dn,
  * incremented reference, so it should be free'd (ENGINE_finish) before it is
  * discarded.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_default_RSA(void);
-#  endif
+#endif
 /* Same for the other "methods" */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_default_DSA(void);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_default_EC(void);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_default_DH(void);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_default_RAND(void);
-#  endif
+#endif
 /*
  * These functions can be used to get a functional reference to perform
  * ciphering or digesting corresponding to "nid".
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_cipher_engine(int nid);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_digest_engine(int nid);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_pkey_meth_engine(int nid);
 OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
-#  endif
+#endif
 
 /*
  * This sets a new default ENGINE structure for performing RSA operations. If
@@ -680,13 +682,13 @@ OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
  * its reference count up'd so the caller should still free their own
  * reference 'e'.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_RSA(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_string(ENGINE *e,
-                                                    const char *def_list);
-#  endif
+    const char *def_list);
+#endif
 /* Same for the other "methods" */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_DSA(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_EC(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_DH(ENGINE *e);
@@ -695,7 +697,7 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_ciphers(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_digests(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_meths(ENGINE *e);
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
-#  endif
+#endif
 
 /*
  * The combination "set" - the flags are bitwise "OR"d from the
@@ -704,10 +706,10 @@ OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
  * application requires only specific functionality, consider using more
  * selective functions.
  */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default(ENGINE *e, unsigned int flags);
 OSSL_DEPRECATEDIN_3_0 void ENGINE_add_conf_module(void);
-#  endif
+#endif
 
 /* Deprecated functions ... */
 /* int ENGINE_clear_defaults(void); */
@@ -717,12 +719,12 @@ OSSL_DEPRECATEDIN_3_0 void ENGINE_add_conf_module(void);
 /**************************/
 
 /* Binary/behaviour compatibility levels */
-#  define OSSL_DYNAMIC_VERSION            (unsigned long)0x00030000
+#define OSSL_DYNAMIC_VERSION (unsigned long)0x00030000
 /*
  * Binary versions older than this are too old for us (whether we're a loader
  * or a loadee)
  */
-#  define OSSL_DYNAMIC_OLDEST             (unsigned long)0x00030000
+#define OSSL_DYNAMIC_OLDEST (unsigned long)0x00030000
 
 /*
  * When compiling an ENGINE entirely as an external shared library, loadable
@@ -735,9 +737,9 @@ OSSL_DEPRECATEDIN_3_0 void ENGINE_add_conf_module(void);
  * same static data as the calling application (or library), and thus whether
  * these callbacks need to be set or not.
  */
-typedef void *(*dyn_MEM_malloc_fn) (size_t, const char *, int);
-typedef void *(*dyn_MEM_realloc_fn) (void *, size_t, const char *, int);
-typedef void (*dyn_MEM_free_fn) (void *, const char *, int);
+typedef void *(*dyn_MEM_malloc_fn)(size_t, const char *, int);
+typedef void *(*dyn_MEM_realloc_fn)(void *, size_t, const char *, int);
+typedef void (*dyn_MEM_free_fn)(void *, const char *, int);
 typedef struct st_dynamic_MEM_fns {
     dyn_MEM_malloc_fn malloc_fn;
     dyn_MEM_realloc_fn realloc_fn;
@@ -765,12 +767,15 @@ typedef struct st_dynamic_fns {
  * implementation can be fully instantiated with
  * IMPLEMENT_DYNAMIC_CHECK_FN().
  */
-typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
-#  define IMPLEMENT_DYNAMIC_CHECK_FN() \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-                if (v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-                return 0; }
+typedef unsigned long (*dynamic_v_check_fn)(unsigned long ossl_version);
+#define IMPLEMENT_DYNAMIC_CHECK_FN()                       \
+    OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
+    OPENSSL_EXPORT unsigned long v_check(unsigned long v)  \
+    {                                                      \
+        if (v >= OSSL_DYNAMIC_OLDEST)                      \
+            return OSSL_DYNAMIC_VERSION;                   \
+        return 0;                                          \
+    }
 
 /*
  * This function is passed the ENGINE structure to initialise with its own
@@ -790,21 +795,25 @@ typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
  * returns an int value (zero for failure). 'fn' should have prototype;
  * [static] int fn(ENGINE *e, const char *id);
  */
-typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
-                                    const dynamic_fns *fns);
-#  define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-            if (ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-            CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \
-                                     fns->mem_fns.realloc_fn, \
-                                     fns->mem_fns.free_fn); \
-            OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \
-        skip_cbs: \
-            if (!fn(e, id)) return 0; \
-            return 1; }
+typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
+    const dynamic_fns *fns);
+#define IMPLEMENT_DYNAMIC_BIND_FN(fn)                                   \
+    OPENSSL_EXPORT                                                      \
+    int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
+    OPENSSL_EXPORT                                                      \
+    int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns)  \
+    {                                                                   \
+        if (ENGINE_get_static_state() == fns->static_state)             \
+            goto skip_cbs;                                              \
+        CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn,                \
+            fns->mem_fns.realloc_fn,                                    \
+            fns->mem_fns.free_fn);                                      \
+        OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);              \
+    skip_cbs:                                                           \
+        if (!fn(e, id))                                                 \
+            return 0;                                                   \
+        return 1;                                                       \
+    }
 
 /*
  * If the loading application (or library) and the loaded ENGINE library
@@ -819,15 +828,14 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
  */
 void *ENGINE_get_static_state(void);
 
-#  if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
-#   ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 void ENGINE_setup_bsd_cryptodev(void);
-#   endif
-#  endif
-
+#endif
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif /* OPENSSL_NO_ENGINE */
-#endif  /* OPENSSL_ENGINE_H */
+#endif
+#endif /* OPENSSL_NO_ENGINE */
+#endif /* OPENSSL_ENGINE_H */
diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h
index d439b6827e60..7cdfb8aa6488 100644
--- a/include/openssl/engineerr.h
+++ b/include/openssl/engineerr.h
@@ -9,55 +9,53 @@
  */
 
 #ifndef OPENSSL_ENGINEERR_H
-# define OPENSSL_ENGINEERR_H
-# pragma once
+#define OPENSSL_ENGINEERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_ENGINE
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_ENGINE
 
 /*
  * ENGINE reason codes.
  */
-#  define ENGINE_R_ALREADY_LOADED                          100
-#  define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER                133
-#  define ENGINE_R_CMD_NOT_EXECUTABLE                      134
-#  define ENGINE_R_COMMAND_TAKES_INPUT                     135
-#  define ENGINE_R_COMMAND_TAKES_NO_INPUT                  136
-#  define ENGINE_R_CONFLICTING_ENGINE_ID                   103
-#  define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED            119
-#  define ENGINE_R_DSO_FAILURE                             104
-#  define ENGINE_R_DSO_NOT_FOUND                           132
-#  define ENGINE_R_ENGINES_SECTION_ERROR                   148
-#  define ENGINE_R_ENGINE_CONFIGURATION_ERROR              102
-#  define ENGINE_R_ENGINE_IS_NOT_IN_LIST                   105
-#  define ENGINE_R_ENGINE_SECTION_ERROR                    149
-#  define ENGINE_R_FAILED_LOADING_PRIVATE_KEY              128
-#  define ENGINE_R_FAILED_LOADING_PUBLIC_KEY               129
-#  define ENGINE_R_FINISH_FAILED                           106
-#  define ENGINE_R_ID_OR_NAME_MISSING                      108
-#  define ENGINE_R_INIT_FAILED                             109
-#  define ENGINE_R_INTERNAL_LIST_ERROR                     110
-#  define ENGINE_R_INVALID_ARGUMENT                        143
-#  define ENGINE_R_INVALID_CMD_NAME                        137
-#  define ENGINE_R_INVALID_CMD_NUMBER                      138
-#  define ENGINE_R_INVALID_INIT_VALUE                      151
-#  define ENGINE_R_INVALID_STRING                          150
-#  define ENGINE_R_NOT_INITIALISED                         117
-#  define ENGINE_R_NOT_LOADED                              112
-#  define ENGINE_R_NO_CONTROL_FUNCTION                     120
-#  define ENGINE_R_NO_INDEX                                144
-#  define ENGINE_R_NO_LOAD_FUNCTION                        125
-#  define ENGINE_R_NO_REFERENCE                            130
-#  define ENGINE_R_NO_SUCH_ENGINE                          116
-#  define ENGINE_R_UNIMPLEMENTED_CIPHER                    146
-#  define ENGINE_R_UNIMPLEMENTED_DIGEST                    147
-#  define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD         101
-#  define ENGINE_R_VERSION_INCOMPATIBILITY                 145
+#define ENGINE_R_ALREADY_LOADED 100
+#define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER 133
+#define ENGINE_R_CMD_NOT_EXECUTABLE 134
+#define ENGINE_R_COMMAND_TAKES_INPUT 135
+#define ENGINE_R_COMMAND_TAKES_NO_INPUT 136
+#define ENGINE_R_CONFLICTING_ENGINE_ID 103
+#define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED 119
+#define ENGINE_R_DSO_FAILURE 104
+#define ENGINE_R_DSO_NOT_FOUND 132
+#define ENGINE_R_ENGINES_SECTION_ERROR 148
+#define ENGINE_R_ENGINE_CONFIGURATION_ERROR 102
+#define ENGINE_R_ENGINE_IS_NOT_IN_LIST 105
+#define ENGINE_R_ENGINE_SECTION_ERROR 149
+#define ENGINE_R_FAILED_LOADING_PRIVATE_KEY 128
+#define ENGINE_R_FAILED_LOADING_PUBLIC_KEY 129
+#define ENGINE_R_FINISH_FAILED 106
+#define ENGINE_R_ID_OR_NAME_MISSING 108
+#define ENGINE_R_INIT_FAILED 109
+#define ENGINE_R_INTERNAL_LIST_ERROR 110
+#define ENGINE_R_INVALID_ARGUMENT 143
+#define ENGINE_R_INVALID_CMD_NAME 137
+#define ENGINE_R_INVALID_CMD_NUMBER 138
+#define ENGINE_R_INVALID_INIT_VALUE 151
+#define ENGINE_R_INVALID_STRING 150
+#define ENGINE_R_NOT_INITIALISED 117
+#define ENGINE_R_NOT_LOADED 112
+#define ENGINE_R_NO_CONTROL_FUNCTION 120
+#define ENGINE_R_NO_INDEX 144
+#define ENGINE_R_NO_LOAD_FUNCTION 125
+#define ENGINE_R_NO_REFERENCE 130
+#define ENGINE_R_NO_SUCH_ENGINE 116
+#define ENGINE_R_UNIMPLEMENTED_CIPHER 146
+#define ENGINE_R_UNIMPLEMENTED_DIGEST 147
+#define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD 101
+#define ENGINE_R_VERSION_INCOMPATIBILITY 145
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in
index 9143704c098e..d451f82eca65 100644
--- a/include/openssl/err.h.in
+++ b/include/openssl/err.h.in
@@ -7,54 +7,56 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_lhash_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_ERR_H
-# define OPENSSL_ERR_H
-# pragma once
+#define OPENSSL_ERR_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ERR_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ERR_H
+#endif
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-#  include <stdlib.h>
-# endif
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#include <stdlib.h>
+#endif
 
-# include <openssl/types.h>
-# include <openssl/bio.h>
-# include <openssl/lhash.h>
-# include <openssl/cryptoerr_legacy.h>
+#include <openssl/types.h>
+#include <openssl/bio.h>
+#include <openssl/lhash.h>
+#include <openssl/cryptoerr_legacy.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_FILENAMES
-#   define ERR_PUT_error(l,f,r,fn,ln)      ERR_put_error(l,f,r,fn,ln)
-#  else
-#   define ERR_PUT_error(l,f,r,fn,ln)      ERR_put_error(l,f,r,NULL,0)
-#  endif
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_FILENAMES
+#define ERR_PUT_error(l, f, r, fn, ln) ERR_put_error(l, f, r, fn, ln)
+#else
+#define ERR_PUT_error(l, f, r, fn, ln) ERR_put_error(l, f, r, NULL, 0)
+#endif
+#endif
 
-# include <limits.h>
-# include <errno.h>
+#include <limits.h>
+#include <errno.h>
 
-# define ERR_TXT_MALLOCED        0x01
-# define ERR_TXT_STRING          0x02
+#define ERR_TXT_MALLOCED 0x01
+#define ERR_TXT_STRING 0x02
 
-# if !defined(OPENSSL_NO_DEPRECATED_3_0) || defined(OSSL_FORCE_ERR_STATE)
-#  define ERR_FLAG_MARK           0x01
-#  define ERR_FLAG_CLEAR          0x02
+#if !defined(OPENSSL_NO_DEPRECATED_3_0) || defined(OSSL_FORCE_ERR_STATE)
+#define ERR_FLAG_MARK 0x01
+#define ERR_FLAG_CLEAR 0x02
 
-#  define ERR_NUM_ERRORS  16
+#define ERR_NUM_ERRORS 16
 struct err_state_st {
     int err_flags[ERR_NUM_ERRORS];
     int err_marks[ERR_NUM_ERRORS];
@@ -67,109 +69,109 @@ struct err_state_st {
     char *err_func[ERR_NUM_ERRORS];
     int top, bottom;
 };
-# endif
+#endif
 
 /* library */
-# define ERR_LIB_NONE            1
-# define ERR_LIB_SYS             2
-# define ERR_LIB_BN              3
-# define ERR_LIB_RSA             4
-# define ERR_LIB_DH              5
-# define ERR_LIB_EVP             6
-# define ERR_LIB_BUF             7
-# define ERR_LIB_OBJ             8
-# define ERR_LIB_PEM             9
-# define ERR_LIB_DSA             10
-# define ERR_LIB_X509            11
+#define ERR_LIB_NONE 1
+#define ERR_LIB_SYS 2
+#define ERR_LIB_BN 3
+#define ERR_LIB_RSA 4
+#define ERR_LIB_DH 5
+#define ERR_LIB_EVP 6
+#define ERR_LIB_BUF 7
+#define ERR_LIB_OBJ 8
+#define ERR_LIB_PEM 9
+#define ERR_LIB_DSA 10
+#define ERR_LIB_X509 11
 /* #define ERR_LIB_METH         12 */
-# define ERR_LIB_ASN1            13
-# define ERR_LIB_CONF            14
-# define ERR_LIB_CRYPTO          15
-# define ERR_LIB_EC              16
-# define ERR_LIB_SSL             20
+#define ERR_LIB_ASN1 13
+#define ERR_LIB_CONF 14
+#define ERR_LIB_CRYPTO 15
+#define ERR_LIB_EC 16
+#define ERR_LIB_SSL 20
 /* #define ERR_LIB_SSL23        21 */
 /* #define ERR_LIB_SSL2         22 */
 /* #define ERR_LIB_SSL3         23 */
 /* #define ERR_LIB_RSAREF       30 */
 /* #define ERR_LIB_PROXY        31 */
-# define ERR_LIB_BIO             32
-# define ERR_LIB_PKCS7           33
-# define ERR_LIB_X509V3          34
-# define ERR_LIB_PKCS12          35
-# define ERR_LIB_RAND            36
-# define ERR_LIB_DSO             37
-# define ERR_LIB_ENGINE          38
-# define ERR_LIB_OCSP            39
-# define ERR_LIB_UI              40
-# define ERR_LIB_COMP            41
-# define ERR_LIB_ECDSA           42
-# define ERR_LIB_ECDH            43
-# define ERR_LIB_OSSL_STORE      44
-# define ERR_LIB_FIPS            45
-# define ERR_LIB_CMS             46
-# define ERR_LIB_TS              47
-# define ERR_LIB_HMAC            48
+#define ERR_LIB_BIO 32
+#define ERR_LIB_PKCS7 33
+#define ERR_LIB_X509V3 34
+#define ERR_LIB_PKCS12 35
+#define ERR_LIB_RAND 36
+#define ERR_LIB_DSO 37
+#define ERR_LIB_ENGINE 38
+#define ERR_LIB_OCSP 39
+#define ERR_LIB_UI 40
+#define ERR_LIB_COMP 41
+#define ERR_LIB_ECDSA 42
+#define ERR_LIB_ECDH 43
+#define ERR_LIB_OSSL_STORE 44
+#define ERR_LIB_FIPS 45
+#define ERR_LIB_CMS 46
+#define ERR_LIB_TS 47
+#define ERR_LIB_HMAC 48
 /* # define ERR_LIB_JPAKE       49 */
-# define ERR_LIB_CT              50
-# define ERR_LIB_ASYNC           51
-# define ERR_LIB_KDF             52
-# define ERR_LIB_SM2             53
-# define ERR_LIB_ESS             54
-# define ERR_LIB_PROP            55
-# define ERR_LIB_CRMF            56
-# define ERR_LIB_PROV            57
-# define ERR_LIB_CMP             58
-# define ERR_LIB_OSSL_ENCODER    59
-# define ERR_LIB_OSSL_DECODER    60
-# define ERR_LIB_HTTP            61
+#define ERR_LIB_CT 50
+#define ERR_LIB_ASYNC 51
+#define ERR_LIB_KDF 52
+#define ERR_LIB_SM2 53
+#define ERR_LIB_ESS 54
+#define ERR_LIB_PROP 55
+#define ERR_LIB_CRMF 56
+#define ERR_LIB_PROV 57
+#define ERR_LIB_CMP 58
+#define ERR_LIB_OSSL_ENCODER 59
+#define ERR_LIB_OSSL_DECODER 60
+#define ERR_LIB_HTTP 61
 
-# define ERR_LIB_USER            128
+#define ERR_LIB_USER 128
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define ASN1err(f, r) ERR_raise_data(ERR_LIB_ASN1, (r), NULL)
-#  define ASYNCerr(f, r) ERR_raise_data(ERR_LIB_ASYNC, (r), NULL)
-#  define BIOerr(f, r) ERR_raise_data(ERR_LIB_BIO, (r), NULL)
-#  define BNerr(f, r)  ERR_raise_data(ERR_LIB_BN, (r), NULL)
-#  define BUFerr(f, r) ERR_raise_data(ERR_LIB_BUF, (r), NULL)
-#  define CMPerr(f, r) ERR_raise_data(ERR_LIB_CMP, (r), NULL)
-#  define CMSerr(f, r) ERR_raise_data(ERR_LIB_CMS, (r), NULL)
-#  define COMPerr(f, r) ERR_raise_data(ERR_LIB_COMP, (r), NULL)
-#  define CONFerr(f, r) ERR_raise_data(ERR_LIB_CONF, (r), NULL)
-#  define CRMFerr(f, r) ERR_raise_data(ERR_LIB_CRMF, (r), NULL)
-#  define CRYPTOerr(f, r) ERR_raise_data(ERR_LIB_CRYPTO, (r), NULL)
-#  define CTerr(f, r) ERR_raise_data(ERR_LIB_CT, (r), NULL)
-#  define DHerr(f, r)  ERR_raise_data(ERR_LIB_DH, (r), NULL)
-#  define DSAerr(f, r) ERR_raise_data(ERR_LIB_DSA, (r), NULL)
-#  define DSOerr(f, r) ERR_raise_data(ERR_LIB_DSO, (r), NULL)
-#  define ECDHerr(f, r) ERR_raise_data(ERR_LIB_ECDH, (r), NULL)
-#  define ECDSAerr(f, r) ERR_raise_data(ERR_LIB_ECDSA, (r), NULL)
-#  define ECerr(f, r)  ERR_raise_data(ERR_LIB_EC, (r), NULL)
-#  define ENGINEerr(f, r) ERR_raise_data(ERR_LIB_ENGINE, (r), NULL)
-#  define ESSerr(f, r) ERR_raise_data(ERR_LIB_ESS, (r), NULL)
-#  define EVPerr(f, r) ERR_raise_data(ERR_LIB_EVP, (r), NULL)
-#  define FIPSerr(f, r) ERR_raise_data(ERR_LIB_FIPS, (r), NULL)
-#  define HMACerr(f, r) ERR_raise_data(ERR_LIB_HMAC, (r), NULL)
-#  define HTTPerr(f, r) ERR_raise_data(ERR_LIB_HTTP, (r), NULL)
-#  define KDFerr(f, r) ERR_raise_data(ERR_LIB_KDF, (r), NULL)
-#  define OBJerr(f, r) ERR_raise_data(ERR_LIB_OBJ, (r), NULL)
-#  define OCSPerr(f, r) ERR_raise_data(ERR_LIB_OCSP, (r), NULL)
-#  define OSSL_STOREerr(f, r) ERR_raise_data(ERR_LIB_OSSL_STORE, (r), NULL)
-#  define PEMerr(f, r) ERR_raise_data(ERR_LIB_PEM, (r), NULL)
-#  define PKCS12err(f, r) ERR_raise_data(ERR_LIB_PKCS12, (r), NULL)
-#  define PKCS7err(f, r) ERR_raise_data(ERR_LIB_PKCS7, (r), NULL)
-#  define PROPerr(f, r) ERR_raise_data(ERR_LIB_PROP, (r), NULL)
-#  define PROVerr(f, r) ERR_raise_data(ERR_LIB_PROV, (r), NULL)
-#  define RANDerr(f, r) ERR_raise_data(ERR_LIB_RAND, (r), NULL)
-#  define RSAerr(f, r) ERR_raise_data(ERR_LIB_RSA, (r), NULL)
-#  define KDFerr(f, r) ERR_raise_data(ERR_LIB_KDF, (r), NULL)
-#  define SM2err(f, r) ERR_raise_data(ERR_LIB_SM2, (r), NULL)
-#  define SSLerr(f, r) ERR_raise_data(ERR_LIB_SSL, (r), NULL)
-#  define SYSerr(f, r) ERR_raise_data(ERR_LIB_SYS, (r), NULL)
-#  define TSerr(f, r) ERR_raise_data(ERR_LIB_TS, (r), NULL)
-#  define UIerr(f, r) ERR_raise_data(ERR_LIB_UI, (r), NULL)
-#  define X509V3err(f, r) ERR_raise_data(ERR_LIB_X509V3, (r), NULL)
-#  define X509err(f, r) ERR_raise_data(ERR_LIB_X509, (r), NULL)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define ASN1err(f, r) ERR_raise_data(ERR_LIB_ASN1, (r), NULL)
+#define ASYNCerr(f, r) ERR_raise_data(ERR_LIB_ASYNC, (r), NULL)
+#define BIOerr(f, r) ERR_raise_data(ERR_LIB_BIO, (r), NULL)
+#define BNerr(f, r) ERR_raise_data(ERR_LIB_BN, (r), NULL)
+#define BUFerr(f, r) ERR_raise_data(ERR_LIB_BUF, (r), NULL)
+#define CMPerr(f, r) ERR_raise_data(ERR_LIB_CMP, (r), NULL)
+#define CMSerr(f, r) ERR_raise_data(ERR_LIB_CMS, (r), NULL)
+#define COMPerr(f, r) ERR_raise_data(ERR_LIB_COMP, (r), NULL)
+#define CONFerr(f, r) ERR_raise_data(ERR_LIB_CONF, (r), NULL)
+#define CRMFerr(f, r) ERR_raise_data(ERR_LIB_CRMF, (r), NULL)
+#define CRYPTOerr(f, r) ERR_raise_data(ERR_LIB_CRYPTO, (r), NULL)
+#define CTerr(f, r) ERR_raise_data(ERR_LIB_CT, (r), NULL)
+#define DHerr(f, r) ERR_raise_data(ERR_LIB_DH, (r), NULL)
+#define DSAerr(f, r) ERR_raise_data(ERR_LIB_DSA, (r), NULL)
+#define DSOerr(f, r) ERR_raise_data(ERR_LIB_DSO, (r), NULL)
+#define ECDHerr(f, r) ERR_raise_data(ERR_LIB_ECDH, (r), NULL)
+#define ECDSAerr(f, r) ERR_raise_data(ERR_LIB_ECDSA, (r), NULL)
+#define ECerr(f, r) ERR_raise_data(ERR_LIB_EC, (r), NULL)
+#define ENGINEerr(f, r) ERR_raise_data(ERR_LIB_ENGINE, (r), NULL)
+#define ESSerr(f, r) ERR_raise_data(ERR_LIB_ESS, (r), NULL)
+#define EVPerr(f, r) ERR_raise_data(ERR_LIB_EVP, (r), NULL)
+#define FIPSerr(f, r) ERR_raise_data(ERR_LIB_FIPS, (r), NULL)
+#define HMACerr(f, r) ERR_raise_data(ERR_LIB_HMAC, (r), NULL)
+#define HTTPerr(f, r) ERR_raise_data(ERR_LIB_HTTP, (r), NULL)
+#define KDFerr(f, r) ERR_raise_data(ERR_LIB_KDF, (r), NULL)
+#define OBJerr(f, r) ERR_raise_data(ERR_LIB_OBJ, (r), NULL)
+#define OCSPerr(f, r) ERR_raise_data(ERR_LIB_OCSP, (r), NULL)
+#define OSSL_STOREerr(f, r) ERR_raise_data(ERR_LIB_OSSL_STORE, (r), NULL)
+#define PEMerr(f, r) ERR_raise_data(ERR_LIB_PEM, (r), NULL)
+#define PKCS12err(f, r) ERR_raise_data(ERR_LIB_PKCS12, (r), NULL)
+#define PKCS7err(f, r) ERR_raise_data(ERR_LIB_PKCS7, (r), NULL)
+#define PROPerr(f, r) ERR_raise_data(ERR_LIB_PROP, (r), NULL)
+#define PROVerr(f, r) ERR_raise_data(ERR_LIB_PROV, (r), NULL)
+#define RANDerr(f, r) ERR_raise_data(ERR_LIB_RAND, (r), NULL)
+#define RSAerr(f, r) ERR_raise_data(ERR_LIB_RSA, (r), NULL)
+#define KDFerr(f, r) ERR_raise_data(ERR_LIB_KDF, (r), NULL)
+#define SM2err(f, r) ERR_raise_data(ERR_LIB_SM2, (r), NULL)
+#define SSLerr(f, r) ERR_raise_data(ERR_LIB_SSL, (r), NULL)
+#define SYSerr(f, r) ERR_raise_data(ERR_LIB_SYS, (r), NULL)
+#define TSerr(f, r) ERR_raise_data(ERR_LIB_TS, (r), NULL)
+#define UIerr(f, r) ERR_raise_data(ERR_LIB_UI, (r), NULL)
+#define X509V3err(f, r) ERR_raise_data(ERR_LIB_X509V3, (r), NULL)
+#define X509err(f, r) ERR_raise_data(ERR_LIB_X509, (r), NULL)
+#endif
 
 /*-
  * The error code packs differently depending on if it records a system
@@ -217,28 +219,28 @@ struct err_state_st {
  */
 
 /* Macros to help decode recorded system errors */
-# define ERR_SYSTEM_FLAG                ((unsigned int)INT_MAX + 1)
-# define ERR_SYSTEM_MASK                ((unsigned int)INT_MAX)
+#define ERR_SYSTEM_FLAG ((unsigned int)INT_MAX + 1)
+#define ERR_SYSTEM_MASK ((unsigned int)INT_MAX)
 
 /*
  * Macros to help decode recorded OpenSSL errors
  * As expressed above, RFLAGS and REASON overlap by one bit to allow
  * ERR_R_FATAL to use ERR_RFLAG_FATAL as its reason code.
  */
-# define ERR_LIB_OFFSET                 23L
-# define ERR_LIB_MASK                   0xFF
-# define ERR_RFLAGS_OFFSET              18L
-# define ERR_RFLAGS_MASK                0x1F
-# define ERR_REASON_MASK                0X7FFFFF
+#define ERR_LIB_OFFSET 23L
+#define ERR_LIB_MASK 0xFF
+#define ERR_RFLAGS_OFFSET 18L
+#define ERR_RFLAGS_MASK 0x1F
+#define ERR_REASON_MASK 0X7FFFFF
 
 /*
  * Reason flags are defined pre-shifted to easily combine with the reason
  * number.
  */
-# define ERR_RFLAG_FATAL                (0x1 << ERR_RFLAGS_OFFSET)
-# define ERR_RFLAG_COMMON               (0x2 << ERR_RFLAGS_OFFSET)
+#define ERR_RFLAG_FATAL (0x1 << ERR_RFLAGS_OFFSET)
+#define ERR_RFLAG_COMMON (0x2 << ERR_RFLAGS_OFFSET)
 
-# define ERR_SYSTEM_ERROR(errcode)      (((errcode) & ERR_SYSTEM_FLAG) != 0)
+#define ERR_SYSTEM_ERROR(errcode) (((errcode) & ERR_SYSTEM_FLAG) != 0)
 
 static ossl_unused ossl_inline int ERR_GET_LIB(unsigned long errcode)
 {
@@ -277,108 +279,109 @@ static ossl_unused ossl_inline int ERR_COMMON_ERROR(unsigned long errcode)
  * ERR_PACK takes reason flags and reason code combined in |reason|.
  * ERR_PACK ignores |func|, that parameter is just legacy from pre-3.0 OpenSSL.
  */
-# define ERR_PACK(lib,func,reason)                                      \
-    ( (((unsigned long)(lib)    & ERR_LIB_MASK   ) << ERR_LIB_OFFSET) | \
-      (((unsigned long)(reason) & ERR_REASON_MASK)) )
+#define ERR_PACK(lib, func, reason) \
+    ((((unsigned long)(lib) & ERR_LIB_MASK) << ERR_LIB_OFFSET) | (((unsigned long)(reason) & ERR_REASON_MASK)))
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SYS_F_FOPEN             0
-#  define SYS_F_CONNECT           0
-#  define SYS_F_GETSERVBYNAME     0
-#  define SYS_F_SOCKET            0
-#  define SYS_F_IOCTLSOCKET       0
-#  define SYS_F_BIND              0
-#  define SYS_F_LISTEN            0
-#  define SYS_F_ACCEPT            0
-#  define SYS_F_WSASTARTUP        0
-#  define SYS_F_OPENDIR           0
-#  define SYS_F_FREAD             0
-#  define SYS_F_GETADDRINFO       0
-#  define SYS_F_GETNAMEINFO       0
-#  define SYS_F_SETSOCKOPT        0
-#  define SYS_F_GETSOCKOPT        0
-#  define SYS_F_GETSOCKNAME       0
-#  define SYS_F_GETHOSTBYNAME     0
-#  define SYS_F_FFLUSH            0
-#  define SYS_F_OPEN              0
-#  define SYS_F_CLOSE             0
-#  define SYS_F_IOCTL             0
-#  define SYS_F_STAT              0
-#  define SYS_F_FCNTL             0
-#  define SYS_F_FSTAT             0
-#  define SYS_F_SENDFILE          0
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SYS_F_FOPEN 0
+#define SYS_F_CONNECT 0
+#define SYS_F_GETSERVBYNAME 0
+#define SYS_F_SOCKET 0
+#define SYS_F_IOCTLSOCKET 0
+#define SYS_F_BIND 0
+#define SYS_F_LISTEN 0
+#define SYS_F_ACCEPT 0
+#define SYS_F_WSASTARTUP 0
+#define SYS_F_OPENDIR 0
+#define SYS_F_FREAD 0
+#define SYS_F_GETADDRINFO 0
+#define SYS_F_GETNAMEINFO 0
+#define SYS_F_SETSOCKOPT 0
+#define SYS_F_GETSOCKOPT 0
+#define SYS_F_GETSOCKNAME 0
+#define SYS_F_GETHOSTBYNAME 0
+#define SYS_F_FFLUSH 0
+#define SYS_F_OPEN 0
+#define SYS_F_CLOSE 0
+#define SYS_F_IOCTL 0
+#define SYS_F_STAT 0
+#define SYS_F_FCNTL 0
+#define SYS_F_FSTAT 0
+#define SYS_F_SENDFILE 0
+#endif
 
 /*
  * All ERR_R_ codes must be combined with ERR_RFLAG_COMMON.
  */
 
 /* "we came from here" global reason codes, range 1..255 */
-# define ERR_R_SYS_LIB          (ERR_LIB_SYS/* 2 */ | ERR_RFLAG_COMMON)
-# define ERR_R_BN_LIB           (ERR_LIB_BN/* 3 */ | ERR_RFLAG_COMMON)
-# define ERR_R_RSA_LIB          (ERR_LIB_RSA/* 4 */ | ERR_RFLAG_COMMON)
-# define ERR_R_DH_LIB           (ERR_LIB_DH/* 5 */ | ERR_RFLAG_COMMON)
-# define ERR_R_EVP_LIB          (ERR_LIB_EVP/* 6 */ | ERR_RFLAG_COMMON)
-# define ERR_R_BUF_LIB          (ERR_LIB_BUF/* 7 */ | ERR_RFLAG_COMMON)
-# define ERR_R_OBJ_LIB          (ERR_LIB_OBJ/* 8 */ | ERR_RFLAG_COMMON)
-# define ERR_R_PEM_LIB          (ERR_LIB_PEM/* 9 */ | ERR_RFLAG_COMMON)
-# define ERR_R_DSA_LIB          (ERR_LIB_DSA/* 10 */ | ERR_RFLAG_COMMON)
-# define ERR_R_X509_LIB         (ERR_LIB_X509/* 11 */ | ERR_RFLAG_COMMON)
-# define ERR_R_ASN1_LIB         (ERR_LIB_ASN1/* 13 */ | ERR_RFLAG_COMMON)
-# define ERR_R_CONF_LIB         (ERR_LIB_CONF/* 14 */ | ERR_RFLAG_COMMON)
-# define ERR_R_CRYPTO_LIB       (ERR_LIB_CRYPTO/* 15 */ | ERR_RFLAG_COMMON)
-# define ERR_R_EC_LIB           (ERR_LIB_EC/* 16 */ | ERR_RFLAG_COMMON)
-# define ERR_R_SSL_LIB          (ERR_LIB_SSL/* 20 */ | ERR_RFLAG_COMMON)
-# define ERR_R_BIO_LIB          (ERR_LIB_BIO/* 32 */ | ERR_RFLAG_COMMON)
-# define ERR_R_PKCS7_LIB        (ERR_LIB_PKCS7/* 33 */ | ERR_RFLAG_COMMON)
-# define ERR_R_X509V3_LIB       (ERR_LIB_X509V3/* 34 */ | ERR_RFLAG_COMMON)
-# define ERR_R_PKCS12_LIB       (ERR_LIB_PKCS12/* 35 */ | ERR_RFLAG_COMMON)
-# define ERR_R_RAND_LIB         (ERR_LIB_RAND/* 36 */ | ERR_RFLAG_COMMON)
-# define ERR_R_DSO_LIB          (ERR_LIB_DSO/* 37 */ | ERR_RFLAG_COMMON)
-# define ERR_R_ENGINE_LIB       (ERR_LIB_ENGINE/* 38 */ | ERR_RFLAG_COMMON)
-# define ERR_R_UI_LIB           (ERR_LIB_UI/* 40 */ | ERR_RFLAG_COMMON)
-# define ERR_R_ECDSA_LIB        (ERR_LIB_ECDSA/* 42 */ | ERR_RFLAG_COMMON)
-# define ERR_R_OSSL_STORE_LIB   (ERR_LIB_OSSL_STORE/* 44 */ | ERR_RFLAG_COMMON)
-# define ERR_R_CMS_LIB          (ERR_LIB_CMS/* 46 */ | ERR_RFLAG_COMMON)
-# define ERR_R_TS_LIB           (ERR_LIB_TS/* 47 */ | ERR_RFLAG_COMMON)
-# define ERR_R_CT_LIB           (ERR_LIB_CT/* 50 */ | ERR_RFLAG_COMMON)
-# define ERR_R_PROV_LIB         (ERR_LIB_PROV/* 57 */ | ERR_RFLAG_COMMON)
-# define ERR_R_ESS_LIB          (ERR_LIB_ESS/* 54 */ | ERR_RFLAG_COMMON)
-# define ERR_R_CMP_LIB          (ERR_LIB_CMP/* 58 */ | ERR_RFLAG_COMMON)
-# define ERR_R_OSSL_ENCODER_LIB (ERR_LIB_OSSL_ENCODER/* 59 */ | ERR_RFLAG_COMMON)
-# define ERR_R_OSSL_DECODER_LIB (ERR_LIB_OSSL_DECODER/* 60 */ | ERR_RFLAG_COMMON)
+#define ERR_R_SYS_LIB (ERR_LIB_SYS /* 2 */ | ERR_RFLAG_COMMON)
+#define ERR_R_BN_LIB (ERR_LIB_BN /* 3 */ | ERR_RFLAG_COMMON)
+#define ERR_R_RSA_LIB (ERR_LIB_RSA /* 4 */ | ERR_RFLAG_COMMON)
+#define ERR_R_DH_LIB (ERR_LIB_DH /* 5 */ | ERR_RFLAG_COMMON)
+#define ERR_R_EVP_LIB (ERR_LIB_EVP /* 6 */ | ERR_RFLAG_COMMON)
+#define ERR_R_BUF_LIB (ERR_LIB_BUF /* 7 */ | ERR_RFLAG_COMMON)
+#define ERR_R_OBJ_LIB (ERR_LIB_OBJ /* 8 */ | ERR_RFLAG_COMMON)
+#define ERR_R_PEM_LIB (ERR_LIB_PEM /* 9 */ | ERR_RFLAG_COMMON)
+#define ERR_R_DSA_LIB (ERR_LIB_DSA /* 10 */ | ERR_RFLAG_COMMON)
+#define ERR_R_X509_LIB (ERR_LIB_X509 /* 11 */ | ERR_RFLAG_COMMON)
+#define ERR_R_ASN1_LIB (ERR_LIB_ASN1 /* 13 */ | ERR_RFLAG_COMMON)
+#define ERR_R_CONF_LIB (ERR_LIB_CONF /* 14 */ | ERR_RFLAG_COMMON)
+#define ERR_R_CRYPTO_LIB (ERR_LIB_CRYPTO /* 15 */ | ERR_RFLAG_COMMON)
+#define ERR_R_EC_LIB (ERR_LIB_EC /* 16 */ | ERR_RFLAG_COMMON)
+#define ERR_R_SSL_LIB (ERR_LIB_SSL /* 20 */ | ERR_RFLAG_COMMON)
+#define ERR_R_BIO_LIB (ERR_LIB_BIO /* 32 */ | ERR_RFLAG_COMMON)
+#define ERR_R_PKCS7_LIB (ERR_LIB_PKCS7 /* 33 */ | ERR_RFLAG_COMMON)
+#define ERR_R_X509V3_LIB (ERR_LIB_X509V3 /* 34 */ | ERR_RFLAG_COMMON)
+#define ERR_R_PKCS12_LIB (ERR_LIB_PKCS12 /* 35 */ | ERR_RFLAG_COMMON)
+#define ERR_R_RAND_LIB (ERR_LIB_RAND /* 36 */ | ERR_RFLAG_COMMON)
+#define ERR_R_DSO_LIB (ERR_LIB_DSO /* 37 */ | ERR_RFLAG_COMMON)
+#define ERR_R_ENGINE_LIB (ERR_LIB_ENGINE /* 38 */ | ERR_RFLAG_COMMON)
+#define ERR_R_UI_LIB (ERR_LIB_UI /* 40 */ | ERR_RFLAG_COMMON)
+#define ERR_R_ECDSA_LIB (ERR_LIB_ECDSA /* 42 */ | ERR_RFLAG_COMMON)
+#define ERR_R_OSSL_STORE_LIB (ERR_LIB_OSSL_STORE /* 44 */ | ERR_RFLAG_COMMON)
+#define ERR_R_CMS_LIB (ERR_LIB_CMS /* 46 */ | ERR_RFLAG_COMMON)
+#define ERR_R_TS_LIB (ERR_LIB_TS /* 47 */ | ERR_RFLAG_COMMON)
+#define ERR_R_CT_LIB (ERR_LIB_CT /* 50 */ | ERR_RFLAG_COMMON)
+#define ERR_R_PROV_LIB (ERR_LIB_PROV /* 57 */ | ERR_RFLAG_COMMON)
+#define ERR_R_ESS_LIB (ERR_LIB_ESS /* 54 */ | ERR_RFLAG_COMMON)
+#define ERR_R_CMP_LIB (ERR_LIB_CMP /* 58 */ | ERR_RFLAG_COMMON)
+#define ERR_R_OSSL_ENCODER_LIB (ERR_LIB_OSSL_ENCODER /* 59 */ | ERR_RFLAG_COMMON)
+#define ERR_R_OSSL_DECODER_LIB (ERR_LIB_OSSL_DECODER /* 60 */ | ERR_RFLAG_COMMON)
 
 /* Other common error codes, range 256..2^ERR_RFLAGS_OFFSET-1 */
-# define ERR_R_FATAL                             (ERR_RFLAG_FATAL|ERR_RFLAG_COMMON)
-# define ERR_R_MALLOC_FAILURE                    (256|ERR_R_FATAL)
-# define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (257|ERR_R_FATAL)
-# define ERR_R_PASSED_NULL_PARAMETER             (258|ERR_R_FATAL)
-# define ERR_R_INTERNAL_ERROR                    (259|ERR_R_FATAL)
-# define ERR_R_DISABLED                          (260|ERR_R_FATAL)
-# define ERR_R_INIT_FAIL                         (261|ERR_R_FATAL)
-# define ERR_R_PASSED_INVALID_ARGUMENT           (262|ERR_RFLAG_COMMON)
-# define ERR_R_OPERATION_FAIL                    (263|ERR_R_FATAL)
-# define ERR_R_INVALID_PROVIDER_FUNCTIONS        (264|ERR_R_FATAL)
-# define ERR_R_INTERRUPTED_OR_CANCELLED          (265|ERR_RFLAG_COMMON)
-# define ERR_R_NESTED_ASN1_ERROR                 (266|ERR_RFLAG_COMMON)
-# define ERR_R_MISSING_ASN1_EOS                  (267|ERR_RFLAG_COMMON)
-# define ERR_R_UNSUPPORTED                       (268|ERR_RFLAG_COMMON)
-# define ERR_R_FETCH_FAILED                      (269|ERR_RFLAG_COMMON)
-# define ERR_R_INVALID_PROPERTY_DEFINITION       (270|ERR_RFLAG_COMMON)
-# define ERR_R_UNABLE_TO_GET_READ_LOCK           (271|ERR_R_FATAL)
-# define ERR_R_UNABLE_TO_GET_WRITE_LOCK          (272|ERR_R_FATAL)
+#define ERR_R_FATAL (ERR_RFLAG_FATAL | ERR_RFLAG_COMMON)
+#define ERR_R_MALLOC_FAILURE (256 | ERR_R_FATAL)
+#define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED (257 | ERR_R_FATAL)
+#define ERR_R_PASSED_NULL_PARAMETER (258 | ERR_R_FATAL)
+#define ERR_R_INTERNAL_ERROR (259 | ERR_R_FATAL)
+#define ERR_R_DISABLED (260 | ERR_R_FATAL)
+#define ERR_R_INIT_FAIL (261 | ERR_R_FATAL)
+#define ERR_R_PASSED_INVALID_ARGUMENT (262 | ERR_RFLAG_COMMON)
+#define ERR_R_OPERATION_FAIL (263 | ERR_R_FATAL)
+#define ERR_R_INVALID_PROVIDER_FUNCTIONS (264 | ERR_R_FATAL)
+#define ERR_R_INTERRUPTED_OR_CANCELLED (265 | ERR_RFLAG_COMMON)
+#define ERR_R_NESTED_ASN1_ERROR (266 | ERR_RFLAG_COMMON)
+#define ERR_R_MISSING_ASN1_EOS (267 | ERR_RFLAG_COMMON)
+#define ERR_R_UNSUPPORTED (268 | ERR_RFLAG_COMMON)
+#define ERR_R_FETCH_FAILED (269 | ERR_RFLAG_COMMON)
+#define ERR_R_INVALID_PROPERTY_DEFINITION (270 | ERR_RFLAG_COMMON)
+#define ERR_R_UNABLE_TO_GET_READ_LOCK (271 | ERR_R_FATAL)
+#define ERR_R_UNABLE_TO_GET_WRITE_LOCK (272 | ERR_R_FATAL)
 
 typedef struct ERR_string_data_st {
     unsigned long error;
     const char *string;
 } ERR_STRING_DATA;
 
+/* clang-format off */
 {-
     generate_lhash_macros("ERR_STRING_DATA");
 -}
+/* clang-format on */
 
 /* 12 lines and some on an 80 column terminal */
-#define ERR_MAX_DATA_SIZE       1024
+#define ERR_MAX_DATA_SIZE 1024
 
 /* Building blocks */
 void ERR_new(void);
@@ -387,73 +390,73 @@ void ERR_set_error(int lib, int reason, const char *fmt, ...);
 void ERR_vset_error(int lib, int reason, const char *fmt, va_list args);
 
 /* Main error raising functions */
-# define ERR_raise(lib, reason) ERR_raise_data((lib),(reason),NULL)
-# define ERR_raise_data                                         \
-    (ERR_new(),                                                 \
-     ERR_set_debug(OPENSSL_FILE,OPENSSL_LINE,OPENSSL_FUNC),     \
-     ERR_set_error)
+#define ERR_raise(lib, reason) ERR_raise_data((lib), (reason), NULL)
+#define ERR_raise_data                                           \
+    (ERR_new(),                                                  \
+        ERR_set_debug(OPENSSL_FILE, OPENSSL_LINE, OPENSSL_FUNC), \
+        ERR_set_error)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* Backward compatibility */
-#  define ERR_put_error(lib, func, reason, file, line)          \
-    (ERR_new(),                                                 \
-     ERR_set_debug((file), (line), OPENSSL_FUNC),               \
-     ERR_set_error((lib), (reason), NULL))
-# endif
+#define ERR_put_error(lib, func, reason, file, line) \
+    (ERR_new(),                                      \
+        ERR_set_debug((file), (line), OPENSSL_FUNC), \
+        ERR_set_error((lib), (reason), NULL))
+#endif
 
 void ERR_set_error_data(char *data, int flags);
 
 unsigned long ERR_get_error(void);
 unsigned long ERR_get_error_all(const char **file, int *line,
-                                const char **func,
-                                const char **data, int *flags);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    const char **func,
+    const char **data, int *flags);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 unsigned long ERR_get_error_line(const char **file, int *line);
 OSSL_DEPRECATEDIN_3_0
 unsigned long ERR_get_error_line_data(const char **file, int *line,
-                                      const char **data, int *flags);
+    const char **data, int *flags);
 #endif
 unsigned long ERR_peek_error(void);
 unsigned long ERR_peek_error_line(const char **file, int *line);
 unsigned long ERR_peek_error_func(const char **func);
 unsigned long ERR_peek_error_data(const char **data, int *flags);
 unsigned long ERR_peek_error_all(const char **file, int *line,
-                                 const char **func,
-                                 const char **data, int *flags);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    const char **func,
+    const char **data, int *flags);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 unsigned long ERR_peek_error_line_data(const char **file, int *line,
-                                       const char **data, int *flags);
-# endif
+    const char **data, int *flags);
+#endif
 unsigned long ERR_peek_last_error(void);
 unsigned long ERR_peek_last_error_line(const char **file, int *line);
 unsigned long ERR_peek_last_error_func(const char **func);
 unsigned long ERR_peek_last_error_data(const char **data, int *flags);
 unsigned long ERR_peek_last_error_all(const char **file, int *line,
-                                      const char **func,
-                                      const char **data, int *flags);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    const char **func,
+    const char **data, int *flags);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
-                                            const char **data, int *flags);
-# endif
+    const char **data, int *flags);
+#endif
 
 void ERR_clear_error(void);
 
 char *ERR_error_string(unsigned long e, char *buf);
 void ERR_error_string_n(unsigned long e, char *buf, size_t len);
 const char *ERR_lib_error_string(unsigned long e);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *ERR_func_error_string(unsigned long e);
-# endif
+#endif
 const char *ERR_reason_error_string(unsigned long e);
 
-void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
-                         void *u);
-# ifndef OPENSSL_NO_STDIO
+void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u),
+    void *u);
+#ifndef OPENSSL_NO_STDIO
 void ERR_print_errors_fp(FILE *fp);
-# endif
+#endif
 void ERR_print_errors(BIO *bp);
 
 void ERR_add_error_data(int num, ...);
@@ -466,9 +469,11 @@ int ERR_load_strings_const(const ERR_STRING_DATA *str);
 int ERR_unload_strings(int lib, ERR_STRING_DATA *str);
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# define ERR_load_crypto_strings() \
+#define ERR_load_crypto_strings() \
     OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-# define ERR_free_strings() while(0) continue
+#define ERR_free_strings() \
+    while (0)              \
+    continue
 #endif
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 void ERR_remove_thread_state(void *);
@@ -494,7 +499,7 @@ void OSSL_ERR_STATE_save_to_mark(ERR_STATE *es);
 void OSSL_ERR_STATE_restore(const ERR_STATE *es);
 void OSSL_ERR_STATE_free(ERR_STATE *es);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/openssl/ess.h.in b/include/openssl/ess.h.in
index d1a685b98e3e..62aaec1726e0 100644
--- a/include/openssl/ess.h.in
+++ b/include/openssl/ess.h.in
@@ -9,40 +9,44 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_ESS_H
-# define OPENSSL_ESS_H
-# pragma once
+#define OPENSSL_ESS_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/safestack.h>
-# include <openssl/x509.h>
-# include <openssl/esserr.h>
+#include <openssl/safestack.h>
+#include <openssl/x509.h>
+#include <openssl/esserr.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
-
+#endif
 
 typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
 typedef struct ESS_cert_id ESS_CERT_ID;
 typedef struct ESS_signing_cert ESS_SIGNING_CERT;
 
+/* clang-format off */
 {-
     generate_stack_macros("ESS_CERT_ID");
 -}
-
+/* clang-format on */
 
 typedef struct ESS_signing_cert_v2_st ESS_SIGNING_CERT_V2;
 typedef struct ESS_cert_id_v2_st ESS_CERT_ID_V2;
 
+/* clang-format off */
 {-
     generate_stack_macros("ESS_CERT_ID_V2");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_ALLOC_FUNCTIONS(ESS_ISSUER_SERIAL)
 DECLARE_ASN1_ENCODE_FUNCTIONS_only(ESS_ISSUER_SERIAL, ESS_ISSUER_SERIAL)
@@ -63,19 +67,18 @@ DECLARE_ASN1_FUNCTIONS(ESS_SIGNING_CERT_V2)
 DECLARE_ASN1_DUP_FUNCTION(ESS_SIGNING_CERT_V2)
 
 ESS_SIGNING_CERT *OSSL_ESS_signing_cert_new_init(const X509 *signcert,
-                                                 const STACK_OF(X509) *certs,
-                                                 int set_issuer_serial);
+    const STACK_OF(X509) *certs,
+    int set_issuer_serial);
 ESS_SIGNING_CERT_V2 *OSSL_ESS_signing_cert_v2_new_init(const EVP_MD *hash_alg,
-                                                       const X509 *signcert,
-                                                       const
-                                                       STACK_OF(X509) *certs,
-                                                       int set_issuer_serial);
+    const X509 *signcert,
+    const STACK_OF(X509) *certs,
+    int set_issuer_serial);
 int OSSL_ESS_check_signing_certs(const ESS_SIGNING_CERT *ss,
-                                 const ESS_SIGNING_CERT_V2 *ssv2,
-                                 const STACK_OF(X509) *chain,
-                                 int require_signing_cert);
+    const ESS_SIGNING_CERT_V2 *ssv2,
+    const STACK_OF(X509) *chain,
+    int require_signing_cert);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/esserr.h b/include/openssl/esserr.h
index 165ce7c43751..46881293cb07 100644
--- a/include/openssl/esserr.h
+++ b/include/openssl/esserr.h
@@ -9,24 +9,24 @@
  */
 
 #ifndef OPENSSL_ESSERR_H
-# define OPENSSL_ESSERR_H
-# pragma once
+#define OPENSSL_ESSERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * ESS reason codes.
  */
-# define ESS_R_EMPTY_ESS_CERT_ID_LIST                     107
-# define ESS_R_ESS_CERT_DIGEST_ERROR                      103
-# define ESS_R_ESS_CERT_ID_NOT_FOUND                      104
-# define ESS_R_ESS_CERT_ID_WRONG_ORDER                    105
-# define ESS_R_ESS_DIGEST_ALG_UNKNOWN                     106
-# define ESS_R_ESS_SIGNING_CERTIFICATE_ERROR              102
-# define ESS_R_ESS_SIGNING_CERT_ADD_ERROR                 100
-# define ESS_R_ESS_SIGNING_CERT_V2_ADD_ERROR              101
-# define ESS_R_MISSING_SIGNING_CERTIFICATE_ATTRIBUTE      108
+#define ESS_R_EMPTY_ESS_CERT_ID_LIST 107
+#define ESS_R_ESS_CERT_DIGEST_ERROR 103
+#define ESS_R_ESS_CERT_ID_NOT_FOUND 104
+#define ESS_R_ESS_CERT_ID_WRONG_ORDER 105
+#define ESS_R_ESS_DIGEST_ALG_UNKNOWN 106
+#define ESS_R_ESS_SIGNING_CERTIFICATE_ERROR 102
+#define ESS_R_ESS_SIGNING_CERT_ADD_ERROR 100
+#define ESS_R_ESS_SIGNING_CERT_V2_ADD_ERROR 101
+#define ESS_R_MISSING_SIGNING_CERTIFICATE_ATTRIBUTE 108
 
 #endif
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index e5da1e64151b..e83ad1318346 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -8,111 +8,111 @@
  */
 
 #ifndef OPENSSL_EVP_H
-# define OPENSSL_EVP_H
-# pragma once
+#define OPENSSL_EVP_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_ENVELOPE_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_ENVELOPE_H
+#endif
 
-# include <stdarg.h>
+#include <stdarg.h>
 
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/types.h>
-# include <openssl/core.h>
-# include <openssl/core_dispatch.h>
-# include <openssl/symhacks.h>
-# include <openssl/bio.h>
-# include <openssl/evperr.h>
-# include <openssl/params.h>
+#include <openssl/opensslconf.h>
+#include <openssl/types.h>
+#include <openssl/core.h>
+#include <openssl/core_dispatch.h>
+#include <openssl/symhacks.h>
+#include <openssl/bio.h>
+#include <openssl/evperr.h>
+#include <openssl/params.h>
 
-# define EVP_MAX_MD_SIZE                 64/* longest known is SHA512 */
-# define EVP_MAX_KEY_LENGTH              64
-# define EVP_MAX_IV_LENGTH               16
-# define EVP_MAX_BLOCK_LENGTH            32
-# define EVP_MAX_AEAD_TAG_LENGTH         16
+#define EVP_MAX_MD_SIZE 64 /* longest known is SHA512 */
+#define EVP_MAX_KEY_LENGTH 64
+#define EVP_MAX_IV_LENGTH 16
+#define EVP_MAX_BLOCK_LENGTH 32
+#define EVP_MAX_AEAD_TAG_LENGTH 16
 
 /* Maximum pipes in cipher pipelining */
-# define EVP_MAX_PIPES                   32
+#define EVP_MAX_PIPES 32
 
-# define PKCS5_SALT_LEN                  8
+#define PKCS5_SALT_LEN 8
 /* Default PKCS#5 iteration count */
-# define PKCS5_DEFAULT_ITER              2048
+#define PKCS5_DEFAULT_ITER 2048
 
-# include <openssl/objects.h>
+#include <openssl/objects.h>
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define EVP_PK_RSA      0x0001
-#  define EVP_PK_DSA      0x0002
-#  define EVP_PK_DH       0x0004
-#  define EVP_PK_EC       0x0008
-#  define EVP_PKT_SIGN    0x0010
-#  define EVP_PKT_ENC     0x0020
-#  define EVP_PKT_EXCH    0x0040
-#  define EVP_PKS_RSA     0x0100
-#  define EVP_PKS_DSA     0x0200
-#  define EVP_PKS_EC      0x0400
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define EVP_PK_RSA 0x0001
+#define EVP_PK_DSA 0x0002
+#define EVP_PK_DH 0x0004
+#define EVP_PK_EC 0x0008
+#define EVP_PKT_SIGN 0x0010
+#define EVP_PKT_ENC 0x0020
+#define EVP_PKT_EXCH 0x0040
+#define EVP_PKS_RSA 0x0100
+#define EVP_PKS_DSA 0x0200
+#define EVP_PKS_EC 0x0400
+#endif
 
-# define EVP_PKEY_NONE   NID_undef
-# define EVP_PKEY_RSA    NID_rsaEncryption
-# define EVP_PKEY_RSA2   NID_rsa
-# define EVP_PKEY_RSA_PSS NID_rsassaPss
-# define EVP_PKEY_DSA    NID_dsa
-# define EVP_PKEY_DSA1   NID_dsa_2
-# define EVP_PKEY_DSA2   NID_dsaWithSHA
-# define EVP_PKEY_DSA3   NID_dsaWithSHA1
-# define EVP_PKEY_DSA4   NID_dsaWithSHA1_2
-# define EVP_PKEY_DH     NID_dhKeyAgreement
-# define EVP_PKEY_DHX    NID_dhpublicnumber
-# define EVP_PKEY_EC     NID_X9_62_id_ecPublicKey
-# define EVP_PKEY_SM2    NID_sm2
-# define EVP_PKEY_HMAC   NID_hmac
-# define EVP_PKEY_CMAC   NID_cmac
-# define EVP_PKEY_SCRYPT NID_id_scrypt
-# define EVP_PKEY_TLS1_PRF NID_tls1_prf
-# define EVP_PKEY_HKDF   NID_hkdf
-# define EVP_PKEY_POLY1305 NID_poly1305
-# define EVP_PKEY_SIPHASH NID_siphash
-# define EVP_PKEY_X25519 NID_X25519
-# define EVP_PKEY_ED25519 NID_ED25519
-# define EVP_PKEY_X448 NID_X448
-# define EVP_PKEY_ED448 NID_ED448
-# define EVP_PKEY_ML_DSA_44 NID_ML_DSA_44
-# define EVP_PKEY_ML_DSA_65 NID_ML_DSA_65
-# define EVP_PKEY_ML_DSA_87 NID_ML_DSA_87
-# define EVP_PKEY_SLH_DSA_SHA2_128S NID_SLH_DSA_SHA2_128s
-# define EVP_PKEY_SLH_DSA_SHA2_128F NID_SLH_DSA_SHA2_128f
-# define EVP_PKEY_SLH_DSA_SHA2_192S NID_SLH_DSA_SHA2_192s
-# define EVP_PKEY_SLH_DSA_SHA2_192F NID_SLH_DSA_SHA2_192f
-# define EVP_PKEY_SLH_DSA_SHA2_256S NID_SLH_DSA_SHA2_256s
-# define EVP_PKEY_SLH_DSA_SHA2_256F NID_SLH_DSA_SHA2_256f
-# define EVP_PKEY_SLH_DSA_SHAKE_128S NID_SLH_DSA_SHAKE_128s
-# define EVP_PKEY_SLH_DSA_SHAKE_128F NID_SLH_DSA_SHAKE_128f
-# define EVP_PKEY_SLH_DSA_SHAKE_192S NID_SLH_DSA_SHAKE_192s
-# define EVP_PKEY_SLH_DSA_SHAKE_192F NID_SLH_DSA_SHAKE_192f
-# define EVP_PKEY_SLH_DSA_SHAKE_256S NID_SLH_DSA_SHAKE_256s
-# define EVP_PKEY_SLH_DSA_SHAKE_256F NID_SLH_DSA_SHAKE_256f
+#define EVP_PKEY_NONE NID_undef
+#define EVP_PKEY_RSA NID_rsaEncryption
+#define EVP_PKEY_RSA2 NID_rsa
+#define EVP_PKEY_RSA_PSS NID_rsassaPss
+#define EVP_PKEY_DSA NID_dsa
+#define EVP_PKEY_DSA1 NID_dsa_2
+#define EVP_PKEY_DSA2 NID_dsaWithSHA
+#define EVP_PKEY_DSA3 NID_dsaWithSHA1
+#define EVP_PKEY_DSA4 NID_dsaWithSHA1_2
+#define EVP_PKEY_DH NID_dhKeyAgreement
+#define EVP_PKEY_DHX NID_dhpublicnumber
+#define EVP_PKEY_EC NID_X9_62_id_ecPublicKey
+#define EVP_PKEY_SM2 NID_sm2
+#define EVP_PKEY_HMAC NID_hmac
+#define EVP_PKEY_CMAC NID_cmac
+#define EVP_PKEY_SCRYPT NID_id_scrypt
+#define EVP_PKEY_TLS1_PRF NID_tls1_prf
+#define EVP_PKEY_HKDF NID_hkdf
+#define EVP_PKEY_POLY1305 NID_poly1305
+#define EVP_PKEY_SIPHASH NID_siphash
+#define EVP_PKEY_X25519 NID_X25519
+#define EVP_PKEY_ED25519 NID_ED25519
+#define EVP_PKEY_X448 NID_X448
+#define EVP_PKEY_ED448 NID_ED448
+#define EVP_PKEY_ML_DSA_44 NID_ML_DSA_44
+#define EVP_PKEY_ML_DSA_65 NID_ML_DSA_65
+#define EVP_PKEY_ML_DSA_87 NID_ML_DSA_87
+#define EVP_PKEY_SLH_DSA_SHA2_128S NID_SLH_DSA_SHA2_128s
+#define EVP_PKEY_SLH_DSA_SHA2_128F NID_SLH_DSA_SHA2_128f
+#define EVP_PKEY_SLH_DSA_SHA2_192S NID_SLH_DSA_SHA2_192s
+#define EVP_PKEY_SLH_DSA_SHA2_192F NID_SLH_DSA_SHA2_192f
+#define EVP_PKEY_SLH_DSA_SHA2_256S NID_SLH_DSA_SHA2_256s
+#define EVP_PKEY_SLH_DSA_SHA2_256F NID_SLH_DSA_SHA2_256f
+#define EVP_PKEY_SLH_DSA_SHAKE_128S NID_SLH_DSA_SHAKE_128s
+#define EVP_PKEY_SLH_DSA_SHAKE_128F NID_SLH_DSA_SHAKE_128f
+#define EVP_PKEY_SLH_DSA_SHAKE_192S NID_SLH_DSA_SHAKE_192s
+#define EVP_PKEY_SLH_DSA_SHAKE_192F NID_SLH_DSA_SHAKE_192f
+#define EVP_PKEY_SLH_DSA_SHAKE_256S NID_SLH_DSA_SHAKE_256s
+#define EVP_PKEY_SLH_DSA_SHAKE_256F NID_SLH_DSA_SHAKE_256f
 
 /* Special indicator that the object is uniquely provider side */
-# define EVP_PKEY_KEYMGMT -1
+#define EVP_PKEY_KEYMGMT -1
 
 /* Easy to use macros for EVP_PKEY related selections */
-# define EVP_PKEY_KEY_PARAMETERS                                            \
-    ( OSSL_KEYMGMT_SELECT_ALL_PARAMETERS )
-# define EVP_PKEY_PRIVATE_KEY                                               \
-    ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PRIVATE_KEY )
-# define EVP_PKEY_PUBLIC_KEY                                                \
-    ( EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PUBLIC_KEY )
-# define EVP_PKEY_KEYPAIR                                                   \
-    ( EVP_PKEY_PUBLIC_KEY | OSSL_KEYMGMT_SELECT_PRIVATE_KEY )
+#define EVP_PKEY_KEY_PARAMETERS \
+    (OSSL_KEYMGMT_SELECT_ALL_PARAMETERS)
+#define EVP_PKEY_PRIVATE_KEY \
+    (EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PRIVATE_KEY)
+#define EVP_PKEY_PUBLIC_KEY \
+    (EVP_PKEY_KEY_PARAMETERS | OSSL_KEYMGMT_SELECT_PUBLIC_KEY)
+#define EVP_PKEY_KEYPAIR \
+    (EVP_PKEY_PUBLIC_KEY | OSSL_KEYMGMT_SELECT_PRIVATE_KEY)
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -121,13 +121,13 @@ char *EVP_get1_default_properties(OSSL_LIB_CTX *libctx);
 int EVP_default_properties_is_fips_enabled(OSSL_LIB_CTX *libctx);
 int EVP_default_properties_enable_fips(OSSL_LIB_CTX *libctx, int enable);
 
-# define EVP_PKEY_MO_SIGN        0x0001
-# define EVP_PKEY_MO_VERIFY      0x0002
-# define EVP_PKEY_MO_ENCRYPT     0x0004
-# define EVP_PKEY_MO_DECRYPT     0x0008
+#define EVP_PKEY_MO_SIGN 0x0001
+#define EVP_PKEY_MO_VERIFY 0x0002
+#define EVP_PKEY_MO_ENCRYPT 0x0004
+#define EVP_PKEY_MO_DECRYPT 0x0008
 
-# ifndef EVP_MD
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef EVP_MD
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 EVP_MD *EVP_MD_meth_new(int md_type, int pkey_type);
 OSSL_DEPRECATEDIN_3_0 EVP_MD *EVP_MD_meth_dup(const EVP_MD *md);
 OSSL_DEPRECATEDIN_3_0 void EVP_MD_meth_free(EVP_MD *md);
@@ -142,20 +142,15 @@ int EVP_MD_meth_set_flags(EVP_MD *md, unsigned long flags);
 OSSL_DEPRECATEDIN_3_0
 int EVP_MD_meth_set_init(EVP_MD *md, int (*init)(EVP_MD_CTX *ctx));
 OSSL_DEPRECATEDIN_3_0
-int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx,
-                                                     const void *data,
-                                                     size_t count));
+int EVP_MD_meth_set_update(EVP_MD *md, int (*update)(EVP_MD_CTX *ctx, const void *data, size_t count));
 OSSL_DEPRECATEDIN_3_0
-int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx,
-                                                   unsigned char *md));
+int EVP_MD_meth_set_final(EVP_MD *md, int (*final)(EVP_MD_CTX *ctx, unsigned char *md));
 OSSL_DEPRECATEDIN_3_0
-int EVP_MD_meth_set_copy(EVP_MD *md, int (*copy)(EVP_MD_CTX *to,
-                                                 const EVP_MD_CTX *from));
+int EVP_MD_meth_set_copy(EVP_MD *md, int (*copy)(EVP_MD_CTX *to, const EVP_MD_CTX *from));
 OSSL_DEPRECATEDIN_3_0
 int EVP_MD_meth_set_cleanup(EVP_MD *md, int (*cleanup)(EVP_MD_CTX *ctx));
 OSSL_DEPRECATEDIN_3_0
-int EVP_MD_meth_set_ctrl(EVP_MD *md, int (*ctrl)(EVP_MD_CTX *ctx, int cmd,
-                                                 int p1, void *p2));
+int EVP_MD_meth_set_ctrl(EVP_MD *md, int (*ctrl)(EVP_MD_CTX *ctx, int cmd, int p1, void *p2));
 OSSL_DEPRECATEDIN_3_0 int EVP_MD_meth_get_input_blocksize(const EVP_MD *md);
 OSSL_DEPRECATEDIN_3_0 int EVP_MD_meth_get_result_size(const EVP_MD *md);
 OSSL_DEPRECATEDIN_3_0 int EVP_MD_meth_get_app_datasize(const EVP_MD *md);
@@ -164,94 +159,94 @@ OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_meth_get_init(const EVP_MD *md))(EVP_MD_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_meth_get_update(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                                const void *data, size_t count);
+    const void *data, size_t count);
 OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_meth_get_final(const EVP_MD *md))(EVP_MD_CTX *ctx,
-                                               unsigned char *md);
+    unsigned char *md);
 OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_meth_get_copy(const EVP_MD *md))(EVP_MD_CTX *to,
-                                              const EVP_MD_CTX *from);
+    const EVP_MD_CTX *from);
 OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_meth_get_cleanup(const EVP_MD *md))(EVP_MD_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_meth_get_ctrl(const EVP_MD *md))(EVP_MD_CTX *ctx, int cmd,
-                                              int p1, void *p2);
-#  endif
+    int p1, void *p2);
+#endif
 /* digest can only handle a single block */
-#  define EVP_MD_FLAG_ONESHOT     0x0001
+#define EVP_MD_FLAG_ONESHOT 0x0001
 
 /* digest is extensible-output function, XOF */
-#  define EVP_MD_FLAG_XOF         0x0002
+#define EVP_MD_FLAG_XOF 0x0002
 
 /* DigestAlgorithmIdentifier flags... */
 
-#  define EVP_MD_FLAG_DIGALGID_MASK               0x0018
+#define EVP_MD_FLAG_DIGALGID_MASK 0x0018
 
 /* NULL or absent parameter accepted. Use NULL */
 
-#  define EVP_MD_FLAG_DIGALGID_NULL               0x0000
+#define EVP_MD_FLAG_DIGALGID_NULL 0x0000
 
 /* NULL or absent parameter accepted. Use NULL for PKCS#1 otherwise absent */
 
-#  define EVP_MD_FLAG_DIGALGID_ABSENT             0x0008
+#define EVP_MD_FLAG_DIGALGID_ABSENT 0x0008
 
 /* Custom handling via ctrl */
 
-#  define EVP_MD_FLAG_DIGALGID_CUSTOM             0x0018
+#define EVP_MD_FLAG_DIGALGID_CUSTOM 0x0018
 
 /* Note if suitable for use in FIPS mode */
-#  define EVP_MD_FLAG_FIPS        0x0400
+#define EVP_MD_FLAG_FIPS 0x0400
 
 /* Digest ctrls */
 
-#  define EVP_MD_CTRL_DIGALGID                    0x1
-#  define EVP_MD_CTRL_MICALG                      0x2
-#  define EVP_MD_CTRL_XOF_LEN                     0x3
-#  define EVP_MD_CTRL_TLSTREE                     0x4
+#define EVP_MD_CTRL_DIGALGID 0x1
+#define EVP_MD_CTRL_MICALG 0x2
+#define EVP_MD_CTRL_XOF_LEN 0x3
+#define EVP_MD_CTRL_TLSTREE 0x4
 
 /* Minimum Algorithm specific ctrl value */
 
-#  define EVP_MD_CTRL_ALG_CTRL                    0x1000
+#define EVP_MD_CTRL_ALG_CTRL 0x1000
 
-# endif                         /* !EVP_MD */
+#endif /* !EVP_MD */
 
 /* values for EVP_MD_CTX flags */
 
-# define EVP_MD_CTX_FLAG_ONESHOT         0x0001/* digest update will be
-                                                * called once only */
-# define EVP_MD_CTX_FLAG_CLEANED         0x0002/* context has already been
-                                                * cleaned */
-# define EVP_MD_CTX_FLAG_REUSE           0x0004/* Don't free up ctx->md_data
-                                                * in EVP_MD_CTX_reset */
+#define EVP_MD_CTX_FLAG_ONESHOT 0x0001 /* digest update will be \
+                                        * called once only */
+#define EVP_MD_CTX_FLAG_CLEANED 0x0002 /* context has already been \
+                                        * cleaned */
+#define EVP_MD_CTX_FLAG_REUSE 0x0004 /* Don't free up ctx->md_data \
+                                      * in EVP_MD_CTX_reset */
 /*
  * FIPS and pad options are ignored in 1.0.0, definitions are here so we
  * don't accidentally reuse the values for other purposes.
  */
 
 /* This flag has no effect from openssl-3.0 onwards */
-# define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW  0x0008
+#define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW 0x0008
 
 /*
  * The following PAD options are also currently ignored in 1.0.0, digest
  * parameters are handled through EVP_DigestSign*() and EVP_DigestVerify*()
  * instead.
  */
-# define EVP_MD_CTX_FLAG_PAD_MASK        0xF0/* RSA mode to use */
-# define EVP_MD_CTX_FLAG_PAD_PKCS1       0x00/* PKCS#1 v1.5 mode */
-# define EVP_MD_CTX_FLAG_PAD_X931        0x10/* X9.31 mode */
-# define EVP_MD_CTX_FLAG_PAD_PSS         0x20/* PSS mode */
+#define EVP_MD_CTX_FLAG_PAD_MASK 0xF0 /* RSA mode to use */
+#define EVP_MD_CTX_FLAG_PAD_PKCS1 0x00 /* PKCS#1 v1.5 mode */
+#define EVP_MD_CTX_FLAG_PAD_X931 0x10 /* X9.31 mode */
+#define EVP_MD_CTX_FLAG_PAD_PSS 0x20 /* PSS mode */
 
-# define EVP_MD_CTX_FLAG_NO_INIT         0x0100/* Don't initialize md_data */
+#define EVP_MD_CTX_FLAG_NO_INIT 0x0100 /* Don't initialize md_data */
 /*
  * Some functions such as EVP_DigestSign only finalise copies of internal
  * contexts so additional data can be included after the finalisation call.
  * This is inefficient if this functionality is not required: it is disabled
  * if the following flag is set.
  */
-# define EVP_MD_CTX_FLAG_FINALISE        0x0200
+#define EVP_MD_CTX_FLAG_FINALISE 0x0200
 /* NOTE: 0x0400 and 0x0800 are reserved for internal usage */
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len);
 OSSL_DEPRECATEDIN_3_0
@@ -266,209 +261,203 @@ OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_impl_ctx_size(EVP_CIPHER *cipher, int ctx_size);
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_init(EVP_CIPHER *cipher,
-                             int (*init) (EVP_CIPHER_CTX *ctx,
-                                          const unsigned char *key,
-                                          const unsigned char *iv,
-                                          int enc));
+    int (*init)(EVP_CIPHER_CTX *ctx,
+        const unsigned char *key,
+        const unsigned char *iv,
+        int enc));
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_do_cipher(EVP_CIPHER *cipher,
-                                  int (*do_cipher) (EVP_CIPHER_CTX *ctx,
-                                                    unsigned char *out,
-                                                    const unsigned char *in,
-                                                    size_t inl));
+    int (*do_cipher)(EVP_CIPHER_CTX *ctx,
+        unsigned char *out,
+        const unsigned char *in,
+        size_t inl));
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_cleanup(EVP_CIPHER *cipher,
-                                int (*cleanup) (EVP_CIPHER_CTX *));
+    int (*cleanup)(EVP_CIPHER_CTX *));
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_set_asn1_params(EVP_CIPHER *cipher,
-                                        int (*set_asn1_parameters) (EVP_CIPHER_CTX *,
-                                                                    ASN1_TYPE *));
+    int (*set_asn1_parameters)(EVP_CIPHER_CTX *,
+        ASN1_TYPE *));
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_get_asn1_params(EVP_CIPHER *cipher,
-                                        int (*get_asn1_parameters) (EVP_CIPHER_CTX *,
-                                                                    ASN1_TYPE *));
+    int (*get_asn1_parameters)(EVP_CIPHER_CTX *,
+        ASN1_TYPE *));
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_meth_set_ctrl(EVP_CIPHER *cipher,
-                             int (*ctrl) (EVP_CIPHER_CTX *, int type,
-                                          int arg, void *ptr));
-OSSL_DEPRECATEDIN_3_0 int
-(*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                      const unsigned char *key,
-                                                      const unsigned char *iv,
-                                                      int enc);
-OSSL_DEPRECATEDIN_3_0 int
-(*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
-                                                           unsigned char *out,
-                                                           const unsigned char *in,
-                                                           size_t inl);
-OSSL_DEPRECATEDIN_3_0 int
-(*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *);
-OSSL_DEPRECATEDIN_3_0 int
-(*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                                 ASN1_TYPE *);
-OSSL_DEPRECATEDIN_3_0 int
-(*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
-                                                                 ASN1_TYPE *);
-OSSL_DEPRECATEDIN_3_0 int
-(*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, int type,
-                                                      int arg, void *ptr);
-# endif
+    int (*ctrl)(EVP_CIPHER_CTX *, int type,
+        int arg, void *ptr));
+OSSL_DEPRECATEDIN_3_0 int (*EVP_CIPHER_meth_get_init(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
+    const unsigned char *key,
+    const unsigned char *iv,
+    int enc);
+OSSL_DEPRECATEDIN_3_0 int (*EVP_CIPHER_meth_get_do_cipher(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *ctx,
+    unsigned char *out,
+    const unsigned char *in,
+    size_t inl);
+OSSL_DEPRECATEDIN_3_0 int (*EVP_CIPHER_meth_get_cleanup(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *);
+OSSL_DEPRECATEDIN_3_0 int (*EVP_CIPHER_meth_get_set_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
+    ASN1_TYPE *);
+OSSL_DEPRECATEDIN_3_0 int (*EVP_CIPHER_meth_get_get_asn1_params(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *,
+    ASN1_TYPE *);
+OSSL_DEPRECATEDIN_3_0 int (*EVP_CIPHER_meth_get_ctrl(const EVP_CIPHER *cipher))(EVP_CIPHER_CTX *, int type,
+    int arg, void *ptr);
+#endif
 
 /* Values for cipher flags */
 
 /* Modes for ciphers */
 
-# define         EVP_CIPH_STREAM_CIPHER          0x0
-# define         EVP_CIPH_ECB_MODE               0x1
-# define         EVP_CIPH_CBC_MODE               0x2
-# define         EVP_CIPH_CFB_MODE               0x3
-# define         EVP_CIPH_OFB_MODE               0x4
-# define         EVP_CIPH_CTR_MODE               0x5
-# define         EVP_CIPH_GCM_MODE               0x6
-# define         EVP_CIPH_CCM_MODE               0x7
-# define         EVP_CIPH_XTS_MODE               0x10001
-# define         EVP_CIPH_WRAP_MODE              0x10002
-# define         EVP_CIPH_OCB_MODE               0x10003
-# define         EVP_CIPH_SIV_MODE               0x10004
-# define         EVP_CIPH_GCM_SIV_MODE           0x10005
-# define         EVP_CIPH_MODE                   0xF0007
+#define EVP_CIPH_STREAM_CIPHER 0x0
+#define EVP_CIPH_ECB_MODE 0x1
+#define EVP_CIPH_CBC_MODE 0x2
+#define EVP_CIPH_CFB_MODE 0x3
+#define EVP_CIPH_OFB_MODE 0x4
+#define EVP_CIPH_CTR_MODE 0x5
+#define EVP_CIPH_GCM_MODE 0x6
+#define EVP_CIPH_CCM_MODE 0x7
+#define EVP_CIPH_XTS_MODE 0x10001
+#define EVP_CIPH_WRAP_MODE 0x10002
+#define EVP_CIPH_OCB_MODE 0x10003
+#define EVP_CIPH_SIV_MODE 0x10004
+#define EVP_CIPH_GCM_SIV_MODE 0x10005
+#define EVP_CIPH_MODE 0xF0007
 /* Set if variable length cipher */
-# define         EVP_CIPH_VARIABLE_LENGTH        0x8
+#define EVP_CIPH_VARIABLE_LENGTH 0x8
 /* Set if the iv handling should be done by the cipher itself */
-# define         EVP_CIPH_CUSTOM_IV              0x10
+#define EVP_CIPH_CUSTOM_IV 0x10
 /* Set if the cipher's init() function should be called if key is NULL */
-# define         EVP_CIPH_ALWAYS_CALL_INIT       0x20
+#define EVP_CIPH_ALWAYS_CALL_INIT 0x20
 /* Call ctrl() to init cipher parameters */
-# define         EVP_CIPH_CTRL_INIT              0x40
+#define EVP_CIPH_CTRL_INIT 0x40
 /* Don't use standard key length function */
-# define         EVP_CIPH_CUSTOM_KEY_LENGTH      0x80
+#define EVP_CIPH_CUSTOM_KEY_LENGTH 0x80
 /* Don't use standard block padding */
-# define         EVP_CIPH_NO_PADDING             0x100
+#define EVP_CIPH_NO_PADDING 0x100
 /* cipher handles random key generation */
-# define         EVP_CIPH_RAND_KEY               0x200
+#define EVP_CIPH_RAND_KEY 0x200
 /* cipher has its own additional copying logic */
-# define         EVP_CIPH_CUSTOM_COPY            0x400
+#define EVP_CIPH_CUSTOM_COPY 0x400
 /* Don't use standard iv length function */
-# define         EVP_CIPH_CUSTOM_IV_LENGTH       0x800
+#define EVP_CIPH_CUSTOM_IV_LENGTH 0x800
 /* Legacy and no longer relevant: Allow use default ASN1 get/set iv */
-# define         EVP_CIPH_FLAG_DEFAULT_ASN1      0
+#define EVP_CIPH_FLAG_DEFAULT_ASN1 0
 /* Free:                                         0x1000 */
 /* Buffer length in bits not bytes: CFB1 mode only */
-# define         EVP_CIPH_FLAG_LENGTH_BITS       0x2000
+#define EVP_CIPH_FLAG_LENGTH_BITS 0x2000
 /* Deprecated FIPS flag: was 0x4000 */
-# define         EVP_CIPH_FLAG_FIPS              0
+#define EVP_CIPH_FLAG_FIPS 0
 /* Deprecated FIPS flag: was 0x8000 */
-# define         EVP_CIPH_FLAG_NON_FIPS_ALLOW    0
+#define EVP_CIPH_FLAG_NON_FIPS_ALLOW 0
 
 /*
  * Cipher handles any and all padding logic as well as finalisation.
  */
-# define         EVP_CIPH_FLAG_CTS               0x4000
-# define         EVP_CIPH_FLAG_CUSTOM_CIPHER     0x100000
-# define         EVP_CIPH_FLAG_AEAD_CIPHER       0x200000
-# define         EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0x400000
+#define EVP_CIPH_FLAG_CTS 0x4000
+#define EVP_CIPH_FLAG_CUSTOM_CIPHER 0x100000
+#define EVP_CIPH_FLAG_AEAD_CIPHER 0x200000
+#define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0x400000
 /* Cipher can handle pipeline operations */
-# define         EVP_CIPH_FLAG_PIPELINE          0X800000
+#define EVP_CIPH_FLAG_PIPELINE 0X800000
 /* For provider implementations that handle  ASN1 get/set param themselves */
-# define         EVP_CIPH_FLAG_CUSTOM_ASN1       0x1000000
+#define EVP_CIPH_FLAG_CUSTOM_ASN1 0x1000000
 /* For ciphers generating unprotected CMS attributes */
-# define         EVP_CIPH_FLAG_CIPHER_WITH_MAC   0x2000000
+#define EVP_CIPH_FLAG_CIPHER_WITH_MAC 0x2000000
 /* For supplementary wrap cipher support */
-# define         EVP_CIPH_FLAG_GET_WRAP_CIPHER   0x4000000
-# define         EVP_CIPH_FLAG_INVERSE_CIPHER    0x8000000
+#define EVP_CIPH_FLAG_GET_WRAP_CIPHER 0x4000000
+#define EVP_CIPH_FLAG_INVERSE_CIPHER 0x8000000
 
 /*
  * Cipher context flag to indicate we can handle wrap mode: if allowed in
  * older applications it could overflow buffers.
  */
 
-# define         EVP_CIPHER_CTX_FLAG_WRAP_ALLOW  0x1
+#define EVP_CIPHER_CTX_FLAG_WRAP_ALLOW 0x1
 
 /* ctrl() values */
 
-# define         EVP_CTRL_INIT                   0x0
-# define         EVP_CTRL_SET_KEY_LENGTH         0x1
-# define         EVP_CTRL_GET_RC2_KEY_BITS       0x2
-# define         EVP_CTRL_SET_RC2_KEY_BITS       0x3
-# define         EVP_CTRL_GET_RC5_ROUNDS         0x4
-# define         EVP_CTRL_SET_RC5_ROUNDS         0x5
-# define         EVP_CTRL_RAND_KEY               0x6
-# define         EVP_CTRL_PBE_PRF_NID            0x7
-# define         EVP_CTRL_COPY                   0x8
-# define         EVP_CTRL_AEAD_SET_IVLEN         0x9
-# define         EVP_CTRL_AEAD_GET_TAG           0x10
-# define         EVP_CTRL_AEAD_SET_TAG           0x11
-# define         EVP_CTRL_AEAD_SET_IV_FIXED      0x12
-# define         EVP_CTRL_GCM_SET_IVLEN          EVP_CTRL_AEAD_SET_IVLEN
-# define         EVP_CTRL_GCM_GET_TAG            EVP_CTRL_AEAD_GET_TAG
-# define         EVP_CTRL_GCM_SET_TAG            EVP_CTRL_AEAD_SET_TAG
-# define         EVP_CTRL_GCM_SET_IV_FIXED       EVP_CTRL_AEAD_SET_IV_FIXED
-# define         EVP_CTRL_GCM_IV_GEN             0x13
-# define         EVP_CTRL_CCM_SET_IVLEN          EVP_CTRL_AEAD_SET_IVLEN
-# define         EVP_CTRL_CCM_GET_TAG            EVP_CTRL_AEAD_GET_TAG
-# define         EVP_CTRL_CCM_SET_TAG            EVP_CTRL_AEAD_SET_TAG
-# define         EVP_CTRL_CCM_SET_IV_FIXED       EVP_CTRL_AEAD_SET_IV_FIXED
-# define         EVP_CTRL_CCM_SET_L              0x14
-# define         EVP_CTRL_CCM_SET_MSGLEN         0x15
+#define EVP_CTRL_INIT 0x0
+#define EVP_CTRL_SET_KEY_LENGTH 0x1
+#define EVP_CTRL_GET_RC2_KEY_BITS 0x2
+#define EVP_CTRL_SET_RC2_KEY_BITS 0x3
+#define EVP_CTRL_GET_RC5_ROUNDS 0x4
+#define EVP_CTRL_SET_RC5_ROUNDS 0x5
+#define EVP_CTRL_RAND_KEY 0x6
+#define EVP_CTRL_PBE_PRF_NID 0x7
+#define EVP_CTRL_COPY 0x8
+#define EVP_CTRL_AEAD_SET_IVLEN 0x9
+#define EVP_CTRL_AEAD_GET_TAG 0x10
+#define EVP_CTRL_AEAD_SET_TAG 0x11
+#define EVP_CTRL_AEAD_SET_IV_FIXED 0x12
+#define EVP_CTRL_GCM_SET_IVLEN EVP_CTRL_AEAD_SET_IVLEN
+#define EVP_CTRL_GCM_GET_TAG EVP_CTRL_AEAD_GET_TAG
+#define EVP_CTRL_GCM_SET_TAG EVP_CTRL_AEAD_SET_TAG
+#define EVP_CTRL_GCM_SET_IV_FIXED EVP_CTRL_AEAD_SET_IV_FIXED
+#define EVP_CTRL_GCM_IV_GEN 0x13
+#define EVP_CTRL_CCM_SET_IVLEN EVP_CTRL_AEAD_SET_IVLEN
+#define EVP_CTRL_CCM_GET_TAG EVP_CTRL_AEAD_GET_TAG
+#define EVP_CTRL_CCM_SET_TAG EVP_CTRL_AEAD_SET_TAG
+#define EVP_CTRL_CCM_SET_IV_FIXED EVP_CTRL_AEAD_SET_IV_FIXED
+#define EVP_CTRL_CCM_SET_L 0x14
+#define EVP_CTRL_CCM_SET_MSGLEN 0x15
 /*
  * AEAD cipher deduces payload length and returns number of bytes required to
  * store MAC and eventual padding. Subsequent call to EVP_Cipher even
  * appends/verifies MAC.
  */
-# define         EVP_CTRL_AEAD_TLS1_AAD          0x16
+#define EVP_CTRL_AEAD_TLS1_AAD 0x16
 /* Used by composite AEAD ciphers, no-op in GCM, CCM... */
-# define         EVP_CTRL_AEAD_SET_MAC_KEY       0x17
+#define EVP_CTRL_AEAD_SET_MAC_KEY 0x17
 /* Set the GCM invocation field, decrypt only */
-# define         EVP_CTRL_GCM_SET_IV_INV         0x18
+#define EVP_CTRL_GCM_SET_IV_INV 0x18
 
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_AAD  0x19
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT      0x1a
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT      0x1b
-# define         EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE  0x1c
+#define EVP_CTRL_TLS1_1_MULTIBLOCK_AAD 0x19
+#define EVP_CTRL_TLS1_1_MULTIBLOCK_ENCRYPT 0x1a
+#define EVP_CTRL_TLS1_1_MULTIBLOCK_DECRYPT 0x1b
+#define EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE 0x1c
 
-# define         EVP_CTRL_SSL3_MASTER_SECRET             0x1d
+#define EVP_CTRL_SSL3_MASTER_SECRET 0x1d
 
 /* EVP_CTRL_SET_SBOX takes the char * specifying S-boxes */
-# define         EVP_CTRL_SET_SBOX                       0x1e
+#define EVP_CTRL_SET_SBOX 0x1e
 /*
  * EVP_CTRL_SBOX_USED takes a 'size_t' and 'char *', pointing at a
  * pre-allocated buffer with specified size
  */
-# define         EVP_CTRL_SBOX_USED                      0x1f
+#define EVP_CTRL_SBOX_USED 0x1f
 /* EVP_CTRL_KEY_MESH takes 'size_t' number of bytes to mesh the key after,
  * 0 switches meshing off
  */
-# define         EVP_CTRL_KEY_MESH                       0x20
+#define EVP_CTRL_KEY_MESH 0x20
 /* EVP_CTRL_BLOCK_PADDING_MODE takes the padding mode */
-# define         EVP_CTRL_BLOCK_PADDING_MODE             0x21
+#define EVP_CTRL_BLOCK_PADDING_MODE 0x21
 
 /* Set the output buffers to use for a pipelined operation */
-# define         EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS       0x22
+#define EVP_CTRL_SET_PIPELINE_OUTPUT_BUFS 0x22
 /* Set the input buffers to use for a pipelined operation */
-# define         EVP_CTRL_SET_PIPELINE_INPUT_BUFS        0x23
+#define EVP_CTRL_SET_PIPELINE_INPUT_BUFS 0x23
 /* Set the input buffer lengths to use for a pipelined operation */
-# define         EVP_CTRL_SET_PIPELINE_INPUT_LENS        0x24
+#define EVP_CTRL_SET_PIPELINE_INPUT_LENS 0x24
 /* Get the IV length used by the cipher */
-# define         EVP_CTRL_GET_IVLEN                      0x25
+#define EVP_CTRL_GET_IVLEN 0x25
 /* 0x26 is unused */
 /* Tell the cipher it's doing a speed test (SIV disallows multiple ops) */
-# define         EVP_CTRL_SET_SPEED                      0x27
+#define EVP_CTRL_SET_SPEED 0x27
 /* Get the unprotectedAttrs from cipher ctx */
-# define         EVP_CTRL_PROCESS_UNPROTECTED            0x28
+#define EVP_CTRL_PROCESS_UNPROTECTED 0x28
 /* Get the supplementary wrap cipher */
-#define          EVP_CTRL_GET_WRAP_CIPHER                0x29
+#define EVP_CTRL_GET_WRAP_CIPHER 0x29
 /* TLSTREE key diversification */
-#define          EVP_CTRL_TLSTREE                        0x2A
+#define EVP_CTRL_TLSTREE 0x2A
 
 /* Padding modes */
-#define EVP_PADDING_PKCS7       1
-#define EVP_PADDING_ISO7816_4   2
-#define EVP_PADDING_ANSI923     3
-#define EVP_PADDING_ISO10126    4
-#define EVP_PADDING_ZERO        5
+#define EVP_PADDING_PKCS7 1
+#define EVP_PADDING_ISO7816_4 2
+#define EVP_PADDING_ANSI923 3
+#define EVP_PADDING_ISO10126 4
+#define EVP_PADDING_ZERO 5
 
 /* RFC 5246 defines additional data to be 13 bytes in length */
-# define         EVP_AEAD_TLS1_AAD_LEN           13
+#define EVP_AEAD_TLS1_AAD_LEN 13
 
 typedef struct {
     unsigned char *out;
@@ -479,157 +468,156 @@ typedef struct {
 
 /* GCM TLS constants */
 /* Length of fixed part of IV derived from PRF */
-# define EVP_GCM_TLS_FIXED_IV_LEN                        4
+#define EVP_GCM_TLS_FIXED_IV_LEN 4
 /* Length of explicit part of IV part of TLS records */
-# define EVP_GCM_TLS_EXPLICIT_IV_LEN                     8
+#define EVP_GCM_TLS_EXPLICIT_IV_LEN 8
 /* Length of tag for TLS */
-# define EVP_GCM_TLS_TAG_LEN                             16
+#define EVP_GCM_TLS_TAG_LEN 16
 
 /* CCM TLS constants */
 /* Length of fixed part of IV derived from PRF */
-# define EVP_CCM_TLS_FIXED_IV_LEN                        4
+#define EVP_CCM_TLS_FIXED_IV_LEN 4
 /* Length of explicit part of IV part of TLS records */
-# define EVP_CCM_TLS_EXPLICIT_IV_LEN                     8
+#define EVP_CCM_TLS_EXPLICIT_IV_LEN 8
 /* Total length of CCM IV length for TLS */
-# define EVP_CCM_TLS_IV_LEN                              12
+#define EVP_CCM_TLS_IV_LEN 12
 /* Length of tag for TLS */
-# define EVP_CCM_TLS_TAG_LEN                             16
+#define EVP_CCM_TLS_TAG_LEN 16
 /* Length of CCM8 tag for TLS */
-# define EVP_CCM8_TLS_TAG_LEN                            8
+#define EVP_CCM8_TLS_TAG_LEN 8
 
 /* Length of tag for TLS */
-# define EVP_CHACHAPOLY_TLS_TAG_LEN                      16
+#define EVP_CHACHAPOLY_TLS_TAG_LEN 16
 
 typedef struct evp_cipher_info_st {
     const EVP_CIPHER *cipher;
     unsigned char iv[EVP_MAX_IV_LENGTH];
 } EVP_CIPHER_INFO;
 
-
 /* Password based encryption function */
-typedef int (EVP_PBE_KEYGEN) (EVP_CIPHER_CTX *ctx, const char *pass,
-                              int passlen, ASN1_TYPE *param,
-                              const EVP_CIPHER *cipher, const EVP_MD *md,
-                              int en_de);
+typedef int(EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass,
+    int passlen, ASN1_TYPE *param,
+    const EVP_CIPHER *cipher, const EVP_MD *md,
+    int en_de);
 
-typedef int (EVP_PBE_KEYGEN_EX) (EVP_CIPHER_CTX *ctx, const char *pass,
-                                 int passlen, ASN1_TYPE *param,
-                                 const EVP_CIPHER *cipher, const EVP_MD *md,
-                                 int en_de, OSSL_LIB_CTX *libctx, const char *propq);
+typedef int(EVP_PBE_KEYGEN_EX)(EVP_CIPHER_CTX *ctx, const char *pass,
+    int passlen, ASN1_TYPE *param,
+    const EVP_CIPHER *cipher, const EVP_MD *md,
+    int en_de, OSSL_LIB_CTX *libctx, const char *propq);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-                                                         (rsa))
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define EVP_PKEY_assign_RSA(pkey, rsa) EVP_PKEY_assign((pkey), EVP_PKEY_RSA, \
+    (rsa))
+#endif
 
-# ifndef OPENSSL_NO_DSA
-#  define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-                                        (dsa))
-# endif
+#ifndef OPENSSL_NO_DSA
+#define EVP_PKEY_assign_DSA(pkey, dsa) EVP_PKEY_assign((pkey), EVP_PKEY_DSA, \
+    (dsa))
+#endif
 
-# if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
-#  define EVP_PKEY_assign_DH(pkey,dh) EVP_PKEY_assign((pkey),EVP_PKEY_DH,(dh))
-# endif
+#if !defined(OPENSSL_NO_DH) && !defined(OPENSSL_NO_DEPRECATED_3_0)
+#define EVP_PKEY_assign_DH(pkey, dh) EVP_PKEY_assign((pkey), EVP_PKEY_DH, (dh))
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_EC
-#   define EVP_PKEY_assign_EC_KEY(pkey,eckey) \
-        EVP_PKEY_assign((pkey), EVP_PKEY_EC, (eckey))
-#  endif
-# endif
-# ifndef OPENSSL_NO_SIPHASH
-#  define EVP_PKEY_assign_SIPHASH(pkey,shkey) EVP_PKEY_assign((pkey),\
-                                        EVP_PKEY_SIPHASH,(shkey))
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_EC
+#define EVP_PKEY_assign_EC_KEY(pkey, eckey) \
+    EVP_PKEY_assign((pkey), EVP_PKEY_EC, (eckey))
+#endif
+#endif
+#ifndef OPENSSL_NO_SIPHASH
+#define EVP_PKEY_assign_SIPHASH(pkey, shkey) EVP_PKEY_assign((pkey), \
+    EVP_PKEY_SIPHASH, (shkey))
+#endif
 
-# ifndef OPENSSL_NO_POLY1305
-#  define EVP_PKEY_assign_POLY1305(pkey,polykey) EVP_PKEY_assign((pkey),\
-                                        EVP_PKEY_POLY1305,(polykey))
-# endif
+#ifndef OPENSSL_NO_POLY1305
+#define EVP_PKEY_assign_POLY1305(pkey, polykey) EVP_PKEY_assign((pkey), \
+    EVP_PKEY_POLY1305, (polykey))
+#endif
 
 /* Add some extra combinations */
-# define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
-# define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
-# define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-# define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
+#define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
+#define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
+#define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
+#define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
 
 int EVP_MD_get_type(const EVP_MD *md);
-# define EVP_MD_type EVP_MD_get_type
-# define EVP_MD_nid EVP_MD_get_type
+#define EVP_MD_type EVP_MD_get_type
+#define EVP_MD_nid EVP_MD_get_type
 const char *EVP_MD_get0_name(const EVP_MD *md);
-# define EVP_MD_name EVP_MD_get0_name
+#define EVP_MD_name EVP_MD_get0_name
 const char *EVP_MD_get0_description(const EVP_MD *md);
 int EVP_MD_is_a(const EVP_MD *md, const char *name);
 int EVP_MD_names_do_all(const EVP_MD *md,
-                        void (*fn)(const char *name, void *data),
-                        void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PROVIDER *EVP_MD_get0_provider(const EVP_MD *md);
 int EVP_MD_get_pkey_type(const EVP_MD *md);
-# define EVP_MD_pkey_type EVP_MD_get_pkey_type
+#define EVP_MD_pkey_type EVP_MD_get_pkey_type
 int EVP_MD_get_size(const EVP_MD *md);
-# define EVP_MD_size EVP_MD_get_size
+#define EVP_MD_size EVP_MD_get_size
 int EVP_MD_get_block_size(const EVP_MD *md);
-# define EVP_MD_block_size EVP_MD_get_block_size
+#define EVP_MD_block_size EVP_MD_get_block_size
 unsigned long EVP_MD_get_flags(const EVP_MD *md);
-# define EVP_MD_flags EVP_MD_get_flags
+#define EVP_MD_flags EVP_MD_get_flags
 int EVP_MD_xof(const EVP_MD *md);
 
 const EVP_MD *EVP_MD_CTX_get0_md(const EVP_MD_CTX *ctx);
 EVP_MD *EVP_MD_CTX_get1_md(EVP_MD_CTX *ctx);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0
 int (*EVP_MD_CTX_update_fn(EVP_MD_CTX *ctx))(EVP_MD_CTX *ctx,
-                                             const void *data, size_t count);
+    const void *data, size_t count);
 OSSL_DEPRECATEDIN_3_0
 void EVP_MD_CTX_set_update_fn(EVP_MD_CTX *ctx,
-                              int (*update) (EVP_MD_CTX *ctx,
-                                             const void *data, size_t count));
-# endif
+    int (*update)(EVP_MD_CTX *ctx,
+        const void *data, size_t count));
+#endif
 int EVP_MD_CTX_get_size_ex(const EVP_MD_CTX *ctx);
 
-# define EVP_MD_CTX_get0_name(e)       EVP_MD_get0_name(EVP_MD_CTX_get0_md(e))
-# define EVP_MD_CTX_get_size(e)        EVP_MD_CTX_get_size_ex(e)
-# define EVP_MD_CTX_size               EVP_MD_CTX_get_size_ex
-# define EVP_MD_CTX_get_block_size(e)  EVP_MD_get_block_size(EVP_MD_CTX_get0_md(e))
-# define EVP_MD_CTX_block_size EVP_MD_CTX_get_block_size
-# define EVP_MD_CTX_get_type(e)            EVP_MD_get_type(EVP_MD_CTX_get0_md(e))
-# define EVP_MD_CTX_type EVP_MD_CTX_get_type
+#define EVP_MD_CTX_get0_name(e) EVP_MD_get0_name(EVP_MD_CTX_get0_md(e))
+#define EVP_MD_CTX_get_size(e) EVP_MD_CTX_get_size_ex(e)
+#define EVP_MD_CTX_size EVP_MD_CTX_get_size_ex
+#define EVP_MD_CTX_get_block_size(e) EVP_MD_get_block_size(EVP_MD_CTX_get0_md(e))
+#define EVP_MD_CTX_block_size EVP_MD_CTX_get_block_size
+#define EVP_MD_CTX_get_type(e) EVP_MD_get_type(EVP_MD_CTX_get0_md(e))
+#define EVP_MD_CTX_type EVP_MD_CTX_get_type
 EVP_PKEY_CTX *EVP_MD_CTX_get_pkey_ctx(const EVP_MD_CTX *ctx);
-# define EVP_MD_CTX_pkey_ctx EVP_MD_CTX_get_pkey_ctx
+#define EVP_MD_CTX_pkey_ctx EVP_MD_CTX_get_pkey_ctx
 void EVP_MD_CTX_set_pkey_ctx(EVP_MD_CTX *ctx, EVP_PKEY_CTX *pctx);
 void *EVP_MD_CTX_get0_md_data(const EVP_MD_CTX *ctx);
-# define EVP_MD_CTX_md_data EVP_MD_CTX_get0_md_data
+#define EVP_MD_CTX_md_data EVP_MD_CTX_get0_md_data
 
 int EVP_CIPHER_get_nid(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_nid EVP_CIPHER_get_nid
+#define EVP_CIPHER_nid EVP_CIPHER_get_nid
 const char *EVP_CIPHER_get0_name(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_name EVP_CIPHER_get0_name
+#define EVP_CIPHER_name EVP_CIPHER_get0_name
 const char *EVP_CIPHER_get0_description(const EVP_CIPHER *cipher);
 int EVP_CIPHER_is_a(const EVP_CIPHER *cipher, const char *name);
 int EVP_CIPHER_names_do_all(const EVP_CIPHER *cipher,
-                            void (*fn)(const char *name, void *data),
-                            void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PROVIDER *EVP_CIPHER_get0_provider(const EVP_CIPHER *cipher);
 int EVP_CIPHER_get_block_size(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_block_size EVP_CIPHER_get_block_size
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#define EVP_CIPHER_block_size EVP_CIPHER_get_block_size
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int EVP_CIPHER_impl_ctx_size(const EVP_CIPHER *cipher);
-# endif
+#endif
 int EVP_CIPHER_get_key_length(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_key_length EVP_CIPHER_get_key_length
+#define EVP_CIPHER_key_length EVP_CIPHER_get_key_length
 int EVP_CIPHER_get_iv_length(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_iv_length EVP_CIPHER_get_iv_length
+#define EVP_CIPHER_iv_length EVP_CIPHER_get_iv_length
 unsigned long EVP_CIPHER_get_flags(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_flags EVP_CIPHER_get_flags
+#define EVP_CIPHER_flags EVP_CIPHER_get_flags
 int EVP_CIPHER_get_mode(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_mode EVP_CIPHER_get_mode
+#define EVP_CIPHER_mode EVP_CIPHER_get_mode
 int EVP_CIPHER_get_type(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_type EVP_CIPHER_get_type
+#define EVP_CIPHER_type EVP_CIPHER_get_type
 EVP_CIPHER *EVP_CIPHER_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                             const char *properties);
+    const char *properties);
 int EVP_CIPHER_can_pipeline(const EVP_CIPHER *cipher, int enc);
 int EVP_CIPHER_up_ref(EVP_CIPHER *cipher);
 void EVP_CIPHER_free(EVP_CIPHER *cipher);
@@ -637,31 +625,31 @@ void EVP_CIPHER_free(EVP_CIPHER *cipher);
 const EVP_CIPHER *EVP_CIPHER_CTX_get0_cipher(const EVP_CIPHER_CTX *ctx);
 EVP_CIPHER *EVP_CIPHER_CTX_get1_cipher(EVP_CIPHER_CTX *ctx);
 int EVP_CIPHER_CTX_is_encrypting(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_encrypting EVP_CIPHER_CTX_is_encrypting
+#define EVP_CIPHER_CTX_encrypting EVP_CIPHER_CTX_is_encrypting
 int EVP_CIPHER_CTX_get_nid(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_nid EVP_CIPHER_CTX_get_nid
+#define EVP_CIPHER_CTX_nid EVP_CIPHER_CTX_get_nid
 int EVP_CIPHER_CTX_get_block_size(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_block_size EVP_CIPHER_CTX_get_block_size
+#define EVP_CIPHER_CTX_block_size EVP_CIPHER_CTX_get_block_size
 int EVP_CIPHER_CTX_get_key_length(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_key_length EVP_CIPHER_CTX_get_key_length
+#define EVP_CIPHER_CTX_key_length EVP_CIPHER_CTX_get_key_length
 int EVP_CIPHER_CTX_get_iv_length(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_iv_length EVP_CIPHER_CTX_get_iv_length
+#define EVP_CIPHER_CTX_iv_length EVP_CIPHER_CTX_get_iv_length
 int EVP_CIPHER_CTX_get_tag_length(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_tag_length EVP_CIPHER_CTX_get_tag_length
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#define EVP_CIPHER_CTX_tag_length EVP_CIPHER_CTX_get_tag_length
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 const unsigned char *EVP_CIPHER_CTX_original_iv(const EVP_CIPHER_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx);
-# endif
+#endif
 int EVP_CIPHER_CTX_get_updated_iv(EVP_CIPHER_CTX *ctx, void *buf, size_t len);
 int EVP_CIPHER_CTX_get_original_iv(EVP_CIPHER_CTX *ctx, void *buf, size_t len);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 unsigned char *EVP_CIPHER_CTX_buf_noconst(EVP_CIPHER_CTX *ctx);
-# endif
+#endif
 int EVP_CIPHER_CTX_get_num(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_num EVP_CIPHER_CTX_get_num
+#define EVP_CIPHER_CTX_num EVP_CIPHER_CTX_get_num
 int EVP_CIPHER_CTX_set_num(EVP_CIPHER_CTX *ctx, int num);
 EVP_CIPHER_CTX *EVP_CIPHER_CTX_dup(const EVP_CIPHER_CTX *in);
 int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
@@ -669,50 +657,50 @@ void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
 void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
 void *EVP_CIPHER_CTX_get_cipher_data(const EVP_CIPHER_CTX *ctx);
 void *EVP_CIPHER_CTX_set_cipher_data(EVP_CIPHER_CTX *ctx, void *cipher_data);
-# define EVP_CIPHER_CTX_get0_name(c) EVP_CIPHER_get0_name(EVP_CIPHER_CTX_get0_cipher(c))
-# define EVP_CIPHER_CTX_get_type(c)  EVP_CIPHER_get_type(EVP_CIPHER_CTX_get0_cipher(c))
-# define EVP_CIPHER_CTX_type         EVP_CIPHER_CTX_get_type
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define EVP_CIPHER_CTX_flags(c)    EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(c))
-# endif
-# define EVP_CIPHER_CTX_get_mode(c)  EVP_CIPHER_get_mode(EVP_CIPHER_CTX_get0_cipher(c))
-# define EVP_CIPHER_CTX_mode         EVP_CIPHER_CTX_get_mode
+#define EVP_CIPHER_CTX_get0_name(c) EVP_CIPHER_get0_name(EVP_CIPHER_CTX_get0_cipher(c))
+#define EVP_CIPHER_CTX_get_type(c) EVP_CIPHER_get_type(EVP_CIPHER_CTX_get0_cipher(c))
+#define EVP_CIPHER_CTX_type EVP_CIPHER_CTX_get_type
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define EVP_CIPHER_CTX_flags(c) EVP_CIPHER_get_flags(EVP_CIPHER_CTX_get0_cipher(c))
+#endif
+#define EVP_CIPHER_CTX_get_mode(c) EVP_CIPHER_get_mode(EVP_CIPHER_CTX_get0_cipher(c))
+#define EVP_CIPHER_CTX_mode EVP_CIPHER_CTX_get_mode
 
-# define EVP_ENCODE_LENGTH(l)    ((((l)+2)/3*4)+((l)/48+1)*2+80)
-# define EVP_DECODE_LENGTH(l)    (((l)+3)/4*3+80)
+#define EVP_ENCODE_LENGTH(l) ((((l) + 2) / 3 * 4) + ((l) / 48 + 1) * 2 + 80)
+#define EVP_DECODE_LENGTH(l) (((l) + 3) / 4 * 3 + 80)
 
-# define EVP_SignInit_ex(a,b,c)          EVP_DigestInit_ex(a,b,c)
-# define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
-# define EVP_SignUpdate(a,b,c)           EVP_DigestUpdate(a,b,c)
-# define EVP_VerifyInit_ex(a,b,c)        EVP_DigestInit_ex(a,b,c)
-# define EVP_VerifyInit(a,b)             EVP_DigestInit(a,b)
-# define EVP_VerifyUpdate(a,b,c)         EVP_DigestUpdate(a,b,c)
-# define EVP_OpenUpdate(a,b,c,d,e)       EVP_DecryptUpdate(a,b,c,d,e)
-# define EVP_SealUpdate(a,b,c,d,e)       EVP_EncryptUpdate(a,b,c,d,e)
+#define EVP_SignInit_ex(a, b, c) EVP_DigestInit_ex(a, b, c)
+#define EVP_SignInit(a, b) EVP_DigestInit(a, b)
+#define EVP_SignUpdate(a, b, c) EVP_DigestUpdate(a, b, c)
+#define EVP_VerifyInit_ex(a, b, c) EVP_DigestInit_ex(a, b, c)
+#define EVP_VerifyInit(a, b) EVP_DigestInit(a, b)
+#define EVP_VerifyUpdate(a, b, c) EVP_DigestUpdate(a, b, c)
+#define EVP_OpenUpdate(a, b, c, d, e) EVP_DecryptUpdate(a, b, c, d, e)
+#define EVP_SealUpdate(a, b, c, d, e) EVP_EncryptUpdate(a, b, c, d, e)
 
-# ifdef CONST_STRICT
+#ifdef CONST_STRICT
 void BIO_set_md(BIO *, const EVP_MD *md);
-# else
-#  define BIO_set_md(b,md)          BIO_ctrl(b,BIO_C_SET_MD,0,(void *)(md))
-# endif
-# define BIO_get_md(b,mdp)          BIO_ctrl(b,BIO_C_GET_MD,0,(mdp))
-# define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(mdcp))
-# define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(mdcp))
-# define BIO_get_cipher_status(b)   BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
-# define BIO_get_cipher_ctx(b,c_pp) BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(c_pp))
+#else
+#define BIO_set_md(b, md) BIO_ctrl(b, BIO_C_SET_MD, 0, (void *)(md))
+#endif
+#define BIO_get_md(b, mdp) BIO_ctrl(b, BIO_C_GET_MD, 0, (mdp))
+#define BIO_get_md_ctx(b, mdcp) BIO_ctrl(b, BIO_C_GET_MD_CTX, 0, (mdcp))
+#define BIO_set_md_ctx(b, mdcp) BIO_ctrl(b, BIO_C_SET_MD_CTX, 0, (mdcp))
+#define BIO_get_cipher_status(b) BIO_ctrl(b, BIO_C_GET_CIPHER_STATUS, 0, NULL)
+#define BIO_get_cipher_ctx(b, c_pp) BIO_ctrl(b, BIO_C_GET_CIPHER_CTX, 0, (c_pp))
 
 __owur int EVP_Cipher(EVP_CIPHER_CTX *c,
-                          unsigned char *out,
-                          const unsigned char *in, unsigned int inl);
+    unsigned char *out,
+    const unsigned char *in, unsigned int inl);
 
-# define EVP_add_cipher_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_add_digest_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_delete_cipher_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
-# define EVP_delete_digest_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
+#define EVP_add_cipher_alias(n, alias) \
+    OBJ_NAME_add((alias), OBJ_NAME_TYPE_CIPHER_METH | OBJ_NAME_ALIAS, (n))
+#define EVP_add_digest_alias(n, alias) \
+    OBJ_NAME_add((alias), OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS, (n))
+#define EVP_delete_cipher_alias(alias) \
+    OBJ_NAME_remove(alias, OBJ_NAME_TYPE_CIPHER_METH | OBJ_NAME_ALIAS);
+#define EVP_delete_digest_alias(alias) \
+    OBJ_NAME_remove(alias, OBJ_NAME_TYPE_MD_METH | OBJ_NAME_ALIAS);
 
 int EVP_MD_get_params(const EVP_MD *digest, OSSL_PARAM params[]);
 int EVP_MD_CTX_set_params(EVP_MD_CTX *ctx, const OSSL_PARAM params[]);
@@ -726,180 +714,180 @@ int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
 EVP_MD_CTX *EVP_MD_CTX_new(void);
 int EVP_MD_CTX_reset(EVP_MD_CTX *ctx);
 void EVP_MD_CTX_free(EVP_MD_CTX *ctx);
-# define EVP_MD_CTX_create()     EVP_MD_CTX_new()
-# define EVP_MD_CTX_init(ctx)    EVP_MD_CTX_reset((ctx))
-# define EVP_MD_CTX_destroy(ctx) EVP_MD_CTX_free((ctx))
+#define EVP_MD_CTX_create() EVP_MD_CTX_new()
+#define EVP_MD_CTX_init(ctx) EVP_MD_CTX_reset((ctx))
+#define EVP_MD_CTX_destroy(ctx) EVP_MD_CTX_free((ctx))
 __owur EVP_MD_CTX *EVP_MD_CTX_dup(const EVP_MD_CTX *in);
 __owur int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in);
 void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
 void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
 int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags);
 __owur int EVP_DigestInit_ex2(EVP_MD_CTX *ctx, const EVP_MD *type,
-                              const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 __owur int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type,
-                                 ENGINE *impl);
+    ENGINE *impl);
 __owur int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d,
-                                size_t cnt);
+    size_t cnt);
 __owur int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md,
-                                  unsigned int *s);
+    unsigned int *s);
 __owur int EVP_Digest(const void *data, size_t count,
-                          unsigned char *md, unsigned int *size,
-                          const EVP_MD *type, ENGINE *impl);
+    unsigned char *md, unsigned int *size,
+    const EVP_MD *type, ENGINE *impl);
 __owur int EVP_Q_digest(OSSL_LIB_CTX *libctx, const char *name,
-                        const char *propq, const void *data, size_t datalen,
-                        unsigned char *md, size_t *mdlen);
+    const char *propq, const void *data, size_t datalen,
+    unsigned char *md, size_t *mdlen);
 
 __owur int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
 __owur int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
 __owur int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md,
-                           unsigned int *s);
+    unsigned int *s);
 __owur int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *out,
-                              size_t outlen);
+    size_t outlen);
 __owur int EVP_DigestSqueeze(EVP_MD_CTX *ctx, unsigned char *out,
-                             size_t outlen);
+    size_t outlen);
 
 __owur EVP_MD *EVP_MD_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                            const char *properties);
+    const char *properties);
 
 int EVP_MD_up_ref(EVP_MD *md);
 void EVP_MD_free(EVP_MD *md);
 
 int EVP_read_pw_string(char *buf, int length, const char *prompt, int verify);
 int EVP_read_pw_string_min(char *buf, int minlen, int maxlen,
-                           const char *prompt, int verify);
+    const char *prompt, int verify);
 void EVP_set_pw_prompt(const char *prompt);
 char *EVP_get_pw_prompt(void);
 
 __owur int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
-                          const unsigned char *salt,
-                          const unsigned char *data, int datal, int count,
-                          unsigned char *key, unsigned char *iv);
+    const unsigned char *salt,
+    const unsigned char *data, int datal, int count,
+    unsigned char *key, unsigned char *iv);
 
 void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
 void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
 int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags);
 
 __owur int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                           const unsigned char *key, const unsigned char *iv);
+    const unsigned char *key, const unsigned char *iv);
 __owur int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,
-                                  const EVP_CIPHER *cipher, ENGINE *impl,
-                                  const unsigned char *key,
-                                  const unsigned char *iv);
+    const EVP_CIPHER *cipher, ENGINE *impl,
+    const unsigned char *key,
+    const unsigned char *iv);
 __owur int EVP_EncryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                               const unsigned char *key,
-                               const unsigned char *iv,
-                               const OSSL_PARAM params[]);
+    const unsigned char *key,
+    const unsigned char *iv,
+    const OSSL_PARAM params[]);
 __owur int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                 int *outl, const unsigned char *in, int inl);
+    int *outl, const unsigned char *in, int inl);
 __owur int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                   int *outl);
+    int *outl);
 __owur int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                int *outl);
+    int *outl);
 
 __owur int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                           const unsigned char *key, const unsigned char *iv);
+    const unsigned char *key, const unsigned char *iv);
 __owur int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx,
-                                  const EVP_CIPHER *cipher, ENGINE *impl,
-                                  const unsigned char *key,
-                                  const unsigned char *iv);
+    const EVP_CIPHER *cipher, ENGINE *impl,
+    const unsigned char *key,
+    const unsigned char *iv);
 __owur int EVP_DecryptInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                               const unsigned char *key,
-                               const unsigned char *iv,
-                               const OSSL_PARAM params[]);
+    const unsigned char *key,
+    const unsigned char *iv,
+    const OSSL_PARAM params[]);
 __owur int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                                 int *outl, const unsigned char *in, int inl);
+    int *outl, const unsigned char *in, int inl);
 __owur int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                            int *outl);
+    int *outl);
 __owur int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                                   int *outl);
+    int *outl);
 
 __owur int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                          const unsigned char *key, const unsigned char *iv,
-                          int enc);
+    const unsigned char *key, const unsigned char *iv,
+    int enc);
 __owur int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx,
-                                 const EVP_CIPHER *cipher, ENGINE *impl,
-                                 const unsigned char *key,
-                                 const unsigned char *iv, int enc);
+    const EVP_CIPHER *cipher, ENGINE *impl,
+    const unsigned char *key,
+    const unsigned char *iv, int enc);
 __owur int EVP_CipherInit_SKEY(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                               EVP_SKEY *skey, const unsigned char *iv, size_t iv_len,
-                               int enc, const OSSL_PARAM params[]);
+    EVP_SKEY *skey, const unsigned char *iv, size_t iv_len,
+    int enc, const OSSL_PARAM params[]);
 __owur int EVP_CipherInit_ex2(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                              const unsigned char *key, const unsigned char *iv,
-                              int enc, const OSSL_PARAM params[]);
+    const unsigned char *key, const unsigned char *iv,
+    int enc, const OSSL_PARAM params[]);
 __owur int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                            int *outl, const unsigned char *in, int inl);
+    int *outl, const unsigned char *in, int inl);
 __owur int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                           int *outl);
+    int *outl);
 __owur int EVP_CipherPipelineEncryptInit(EVP_CIPHER_CTX *ctx,
-                                         const EVP_CIPHER *cipher,
-                                         const unsigned char *key, size_t keylen,
-                                         size_t numpipes,
-                                         const unsigned char **iv, size_t ivlen);
+    const EVP_CIPHER *cipher,
+    const unsigned char *key, size_t keylen,
+    size_t numpipes,
+    const unsigned char **iv, size_t ivlen);
 __owur int EVP_CipherPipelineDecryptInit(EVP_CIPHER_CTX *ctx,
-                                         const EVP_CIPHER *cipher,
-                                         const unsigned char *key, size_t keylen,
-                                         size_t numpipes,
-                                         const unsigned char **iv, size_t ivlen);
+    const EVP_CIPHER *cipher,
+    const unsigned char *key, size_t keylen,
+    size_t numpipes,
+    const unsigned char **iv, size_t ivlen);
 __owur int EVP_CipherPipelineUpdate(EVP_CIPHER_CTX *ctx,
-                                    unsigned char **out, size_t *outl,
-                                    const size_t *outsize,
-                                    const unsigned char **in, const size_t *inl);
+    unsigned char **out, size_t *outl,
+    const size_t *outsize,
+    const unsigned char **in, const size_t *inl);
 __owur int EVP_CipherPipelineFinal(EVP_CIPHER_CTX *ctx,
-                                   unsigned char **outm, size_t *outl,
-                                   const size_t *outsize);
+    unsigned char **outm, size_t *outl,
+    const size_t *outsize);
 __owur int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-                              int *outl);
+    int *outl);
 
 __owur int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
-                         EVP_PKEY *pkey);
+    EVP_PKEY *pkey);
 __owur int EVP_SignFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
-                            EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
-                            const char *propq);
+    EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 __owur int EVP_DigestSign(EVP_MD_CTX *ctx, unsigned char *sigret,
-                          size_t *siglen, const unsigned char *tbs,
-                          size_t tbslen);
+    size_t *siglen, const unsigned char *tbs,
+    size_t tbslen);
 
 __owur int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-                           unsigned int siglen, EVP_PKEY *pkey);
+    unsigned int siglen, EVP_PKEY *pkey);
 __owur int EVP_VerifyFinal_ex(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-                              unsigned int siglen, EVP_PKEY *pkey,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    unsigned int siglen, EVP_PKEY *pkey,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 __owur int EVP_DigestVerify(EVP_MD_CTX *ctx, const unsigned char *sigret,
-                            size_t siglen, const unsigned char *tbs,
-                            size_t tbslen);
+    size_t siglen, const unsigned char *tbs,
+    size_t tbslen);
 
 __owur int EVP_DigestSignInit_ex(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                          const char *mdname, OSSL_LIB_CTX *libctx,
-                          const char *props, EVP_PKEY *pkey,
-                          const OSSL_PARAM params[]);
+    const char *mdname, OSSL_LIB_CTX *libctx,
+    const char *props, EVP_PKEY *pkey,
+    const OSSL_PARAM params[]);
 __owur int EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                                  const EVP_MD *type, ENGINE *e,
-                                  EVP_PKEY *pkey);
+    const EVP_MD *type, ENGINE *e,
+    EVP_PKEY *pkey);
 __owur int EVP_DigestSignUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize);
 __owur int EVP_DigestSignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                               size_t *siglen);
+    size_t *siglen);
 
 __owur int EVP_DigestVerifyInit_ex(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                            const char *mdname, OSSL_LIB_CTX *libctx,
-                            const char *props, EVP_PKEY *pkey,
-                            const OSSL_PARAM params[]);
+    const char *mdname, OSSL_LIB_CTX *libctx,
+    const char *props, EVP_PKEY *pkey,
+    const OSSL_PARAM params[]);
 __owur int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                                const EVP_MD *type, ENGINE *e,
-                                EVP_PKEY *pkey);
+    const EVP_MD *type, ENGINE *e,
+    EVP_PKEY *pkey);
 int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize);
 __owur int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sig,
-                                 size_t siglen);
+    size_t siglen);
 
 __owur int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                        const unsigned char *ek, int ekl,
-                        const unsigned char *iv, EVP_PKEY *priv);
+    const unsigned char *ek, int ekl,
+    const unsigned char *iv, EVP_PKEY *priv);
 __owur int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
 
 __owur int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                        unsigned char **ek, int *ekl, unsigned char *iv,
-                        EVP_PKEY **pubk, int npubk);
+    unsigned char **ek, int *ekl, unsigned char *iv,
+    EVP_PKEY **pubk, int npubk);
 __owur int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
 
 EVP_ENCODE_CTX *EVP_ENCODE_CTX_new(void);
@@ -908,21 +896,20 @@ int EVP_ENCODE_CTX_copy(EVP_ENCODE_CTX *dctx, const EVP_ENCODE_CTX *sctx);
 int EVP_ENCODE_CTX_num(EVP_ENCODE_CTX *ctx);
 void EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
 int EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
+    const unsigned char *in, int inl);
 void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl);
 int EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int n);
 
 void EVP_DecodeInit(EVP_ENCODE_CTX *ctx);
 int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
-                    char *out, int *outl);
+    const unsigned char *in, int inl);
+int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl);
 int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define EVP_CIPHER_CTX_init(c)      EVP_CIPHER_CTX_reset(c)
-#  define EVP_CIPHER_CTX_cleanup(c)   EVP_CIPHER_CTX_reset(c)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define EVP_CIPHER_CTX_init(c) EVP_CIPHER_CTX_reset(c)
+#define EVP_CIPHER_CTX_cleanup(c) EVP_CIPHER_CTX_reset(c)
+#endif
 EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
 int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
 void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *c);
@@ -948,23 +935,23 @@ const BIO_METHOD *BIO_f_base64(void);
 const BIO_METHOD *BIO_f_cipher(void);
 const BIO_METHOD *BIO_f_reliable(void);
 __owur int BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
-                          const unsigned char *i, int enc);
+    const unsigned char *i, int enc);
 
 const EVP_MD *EVP_md_null(void);
-# ifndef OPENSSL_NO_MD2
+#ifndef OPENSSL_NO_MD2
 const EVP_MD *EVP_md2(void);
-# endif
-# ifndef OPENSSL_NO_MD4
+#endif
+#ifndef OPENSSL_NO_MD4
 const EVP_MD *EVP_md4(void);
-# endif
-# ifndef OPENSSL_NO_MD5
+#endif
+#ifndef OPENSSL_NO_MD5
 const EVP_MD *EVP_md5(void);
 const EVP_MD *EVP_md5_sha1(void);
-# endif
-# ifndef OPENSSL_NO_BLAKE2
+#endif
+#ifndef OPENSSL_NO_BLAKE2
 const EVP_MD *EVP_blake2b512(void);
 const EVP_MD *EVP_blake2s256(void);
-# endif
+#endif
 const EVP_MD *EVP_sha1(void);
 const EVP_MD *EVP_sha224(void);
 const EVP_MD *EVP_sha256(void);
@@ -979,33 +966,33 @@ const EVP_MD *EVP_sha3_512(void);
 const EVP_MD *EVP_shake128(void);
 const EVP_MD *EVP_shake256(void);
 
-# ifndef OPENSSL_NO_MDC2
+#ifndef OPENSSL_NO_MDC2
 const EVP_MD *EVP_mdc2(void);
-# endif
-# ifndef OPENSSL_NO_RMD160
+#endif
+#ifndef OPENSSL_NO_RMD160
 const EVP_MD *EVP_ripemd160(void);
-# endif
-# ifndef OPENSSL_NO_WHIRLPOOL
+#endif
+#ifndef OPENSSL_NO_WHIRLPOOL
 const EVP_MD *EVP_whirlpool(void);
-# endif
-# ifndef OPENSSL_NO_SM3
+#endif
+#ifndef OPENSSL_NO_SM3
 const EVP_MD *EVP_sm3(void);
-# endif
+#endif
 const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */
-# ifndef OPENSSL_NO_DES
+#ifndef OPENSSL_NO_DES
 const EVP_CIPHER *EVP_des_ecb(void);
 const EVP_CIPHER *EVP_des_ede(void);
 const EVP_CIPHER *EVP_des_ede3(void);
 const EVP_CIPHER *EVP_des_ede_ecb(void);
 const EVP_CIPHER *EVP_des_ede3_ecb(void);
 const EVP_CIPHER *EVP_des_cfb64(void);
-#  define EVP_des_cfb EVP_des_cfb64
+#define EVP_des_cfb EVP_des_cfb64
 const EVP_CIPHER *EVP_des_cfb1(void);
 const EVP_CIPHER *EVP_des_cfb8(void);
 const EVP_CIPHER *EVP_des_ede_cfb64(void);
-#  define EVP_des_ede_cfb EVP_des_ede_cfb64
+#define EVP_des_ede_cfb EVP_des_ede_cfb64
 const EVP_CIPHER *EVP_des_ede3_cfb64(void);
-#  define EVP_des_ede3_cfb EVP_des_ede3_cfb64
+#define EVP_des_ede3_cfb EVP_des_ede3_cfb64
 const EVP_CIPHER *EVP_des_ede3_cfb1(void);
 const EVP_CIPHER *EVP_des_ede3_cfb8(void);
 const EVP_CIPHER *EVP_des_ofb(void);
@@ -1021,57 +1008,57 @@ const EVP_CIPHER *EVP_des_ede3_wrap(void);
  * are rc4 and md5 declarations made here inside a "NO_DES" precompiler
  * branch?
  */
-# endif
-# ifndef OPENSSL_NO_RC4
+#endif
+#ifndef OPENSSL_NO_RC4
 const EVP_CIPHER *EVP_rc4(void);
 const EVP_CIPHER *EVP_rc4_40(void);
-#  ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
 const EVP_CIPHER *EVP_rc4_hmac_md5(void);
-#  endif
-# endif
-# ifndef OPENSSL_NO_IDEA
+#endif
+#endif
+#ifndef OPENSSL_NO_IDEA
 const EVP_CIPHER *EVP_idea_ecb(void);
 const EVP_CIPHER *EVP_idea_cfb64(void);
-#  define EVP_idea_cfb EVP_idea_cfb64
+#define EVP_idea_cfb EVP_idea_cfb64
 const EVP_CIPHER *EVP_idea_ofb(void);
 const EVP_CIPHER *EVP_idea_cbc(void);
-# endif
-# ifndef OPENSSL_NO_RC2
+#endif
+#ifndef OPENSSL_NO_RC2
 const EVP_CIPHER *EVP_rc2_ecb(void);
 const EVP_CIPHER *EVP_rc2_cbc(void);
 const EVP_CIPHER *EVP_rc2_40_cbc(void);
 const EVP_CIPHER *EVP_rc2_64_cbc(void);
 const EVP_CIPHER *EVP_rc2_cfb64(void);
-#  define EVP_rc2_cfb EVP_rc2_cfb64
+#define EVP_rc2_cfb EVP_rc2_cfb64
 const EVP_CIPHER *EVP_rc2_ofb(void);
-# endif
-# ifndef OPENSSL_NO_BF
+#endif
+#ifndef OPENSSL_NO_BF
 const EVP_CIPHER *EVP_bf_ecb(void);
 const EVP_CIPHER *EVP_bf_cbc(void);
 const EVP_CIPHER *EVP_bf_cfb64(void);
-#  define EVP_bf_cfb EVP_bf_cfb64
+#define EVP_bf_cfb EVP_bf_cfb64
 const EVP_CIPHER *EVP_bf_ofb(void);
-# endif
-# ifndef OPENSSL_NO_CAST
+#endif
+#ifndef OPENSSL_NO_CAST
 const EVP_CIPHER *EVP_cast5_ecb(void);
 const EVP_CIPHER *EVP_cast5_cbc(void);
 const EVP_CIPHER *EVP_cast5_cfb64(void);
-#  define EVP_cast5_cfb EVP_cast5_cfb64
+#define EVP_cast5_cfb EVP_cast5_cfb64
 const EVP_CIPHER *EVP_cast5_ofb(void);
-# endif
-# ifndef OPENSSL_NO_RC5
+#endif
+#ifndef OPENSSL_NO_RC5
 const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
 const EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
 const EVP_CIPHER *EVP_rc5_32_12_16_cfb64(void);
-#  define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
+#define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
 const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-# endif
+#endif
 const EVP_CIPHER *EVP_aes_128_ecb(void);
 const EVP_CIPHER *EVP_aes_128_cbc(void);
 const EVP_CIPHER *EVP_aes_128_cfb1(void);
 const EVP_CIPHER *EVP_aes_128_cfb8(void);
 const EVP_CIPHER *EVP_aes_128_cfb128(void);
-# define EVP_aes_128_cfb EVP_aes_128_cfb128
+#define EVP_aes_128_cfb EVP_aes_128_cfb128
 const EVP_CIPHER *EVP_aes_128_ofb(void);
 const EVP_CIPHER *EVP_aes_128_ctr(void);
 const EVP_CIPHER *EVP_aes_128_ccm(void);
@@ -1079,30 +1066,30 @@ const EVP_CIPHER *EVP_aes_128_gcm(void);
 const EVP_CIPHER *EVP_aes_128_xts(void);
 const EVP_CIPHER *EVP_aes_128_wrap(void);
 const EVP_CIPHER *EVP_aes_128_wrap_pad(void);
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
 const EVP_CIPHER *EVP_aes_128_ocb(void);
-# endif
+#endif
 const EVP_CIPHER *EVP_aes_192_ecb(void);
 const EVP_CIPHER *EVP_aes_192_cbc(void);
 const EVP_CIPHER *EVP_aes_192_cfb1(void);
 const EVP_CIPHER *EVP_aes_192_cfb8(void);
 const EVP_CIPHER *EVP_aes_192_cfb128(void);
-# define EVP_aes_192_cfb EVP_aes_192_cfb128
+#define EVP_aes_192_cfb EVP_aes_192_cfb128
 const EVP_CIPHER *EVP_aes_192_ofb(void);
 const EVP_CIPHER *EVP_aes_192_ctr(void);
 const EVP_CIPHER *EVP_aes_192_ccm(void);
 const EVP_CIPHER *EVP_aes_192_gcm(void);
 const EVP_CIPHER *EVP_aes_192_wrap(void);
 const EVP_CIPHER *EVP_aes_192_wrap_pad(void);
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
 const EVP_CIPHER *EVP_aes_192_ocb(void);
-# endif
+#endif
 const EVP_CIPHER *EVP_aes_256_ecb(void);
 const EVP_CIPHER *EVP_aes_256_cbc(void);
 const EVP_CIPHER *EVP_aes_256_cfb1(void);
 const EVP_CIPHER *EVP_aes_256_cfb8(void);
 const EVP_CIPHER *EVP_aes_256_cfb128(void);
-# define EVP_aes_256_cfb EVP_aes_256_cfb128
+#define EVP_aes_256_cfb EVP_aes_256_cfb128
 const EVP_CIPHER *EVP_aes_256_ofb(void);
 const EVP_CIPHER *EVP_aes_256_ctr(void);
 const EVP_CIPHER *EVP_aes_256_ccm(void);
@@ -1110,20 +1097,20 @@ const EVP_CIPHER *EVP_aes_256_gcm(void);
 const EVP_CIPHER *EVP_aes_256_xts(void);
 const EVP_CIPHER *EVP_aes_256_wrap(void);
 const EVP_CIPHER *EVP_aes_256_wrap_pad(void);
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
 const EVP_CIPHER *EVP_aes_256_ocb(void);
-# endif
+#endif
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
 const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha256(void);
 const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void);
-# ifndef OPENSSL_NO_ARIA
+#ifndef OPENSSL_NO_ARIA
 const EVP_CIPHER *EVP_aria_128_ecb(void);
 const EVP_CIPHER *EVP_aria_128_cbc(void);
 const EVP_CIPHER *EVP_aria_128_cfb1(void);
 const EVP_CIPHER *EVP_aria_128_cfb8(void);
 const EVP_CIPHER *EVP_aria_128_cfb128(void);
-#  define EVP_aria_128_cfb EVP_aria_128_cfb128
+#define EVP_aria_128_cfb EVP_aria_128_cfb128
 const EVP_CIPHER *EVP_aria_128_ctr(void);
 const EVP_CIPHER *EVP_aria_128_ofb(void);
 const EVP_CIPHER *EVP_aria_128_gcm(void);
@@ -1133,7 +1120,7 @@ const EVP_CIPHER *EVP_aria_192_cbc(void);
 const EVP_CIPHER *EVP_aria_192_cfb1(void);
 const EVP_CIPHER *EVP_aria_192_cfb8(void);
 const EVP_CIPHER *EVP_aria_192_cfb128(void);
-#  define EVP_aria_192_cfb EVP_aria_192_cfb128
+#define EVP_aria_192_cfb EVP_aria_192_cfb128
 const EVP_CIPHER *EVP_aria_192_ctr(void);
 const EVP_CIPHER *EVP_aria_192_ofb(void);
 const EVP_CIPHER *EVP_aria_192_gcm(void);
@@ -1143,19 +1130,19 @@ const EVP_CIPHER *EVP_aria_256_cbc(void);
 const EVP_CIPHER *EVP_aria_256_cfb1(void);
 const EVP_CIPHER *EVP_aria_256_cfb8(void);
 const EVP_CIPHER *EVP_aria_256_cfb128(void);
-#  define EVP_aria_256_cfb EVP_aria_256_cfb128
+#define EVP_aria_256_cfb EVP_aria_256_cfb128
 const EVP_CIPHER *EVP_aria_256_ctr(void);
 const EVP_CIPHER *EVP_aria_256_ofb(void);
 const EVP_CIPHER *EVP_aria_256_gcm(void);
 const EVP_CIPHER *EVP_aria_256_ccm(void);
-# endif
-# ifndef OPENSSL_NO_CAMELLIA
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
 const EVP_CIPHER *EVP_camellia_128_ecb(void);
 const EVP_CIPHER *EVP_camellia_128_cbc(void);
 const EVP_CIPHER *EVP_camellia_128_cfb1(void);
 const EVP_CIPHER *EVP_camellia_128_cfb8(void);
 const EVP_CIPHER *EVP_camellia_128_cfb128(void);
-#  define EVP_camellia_128_cfb EVP_camellia_128_cfb128
+#define EVP_camellia_128_cfb EVP_camellia_128_cfb128
 const EVP_CIPHER *EVP_camellia_128_ofb(void);
 const EVP_CIPHER *EVP_camellia_128_ctr(void);
 const EVP_CIPHER *EVP_camellia_192_ecb(void);
@@ -1163,7 +1150,7 @@ const EVP_CIPHER *EVP_camellia_192_cbc(void);
 const EVP_CIPHER *EVP_camellia_192_cfb1(void);
 const EVP_CIPHER *EVP_camellia_192_cfb8(void);
 const EVP_CIPHER *EVP_camellia_192_cfb128(void);
-#  define EVP_camellia_192_cfb EVP_camellia_192_cfb128
+#define EVP_camellia_192_cfb EVP_camellia_192_cfb128
 const EVP_CIPHER *EVP_camellia_192_ofb(void);
 const EVP_CIPHER *EVP_camellia_192_ctr(void);
 const EVP_CIPHER *EVP_camellia_256_ecb(void);
@@ -1171,56 +1158,60 @@ const EVP_CIPHER *EVP_camellia_256_cbc(void);
 const EVP_CIPHER *EVP_camellia_256_cfb1(void);
 const EVP_CIPHER *EVP_camellia_256_cfb8(void);
 const EVP_CIPHER *EVP_camellia_256_cfb128(void);
-#  define EVP_camellia_256_cfb EVP_camellia_256_cfb128
+#define EVP_camellia_256_cfb EVP_camellia_256_cfb128
 const EVP_CIPHER *EVP_camellia_256_ofb(void);
 const EVP_CIPHER *EVP_camellia_256_ctr(void);
-# endif
-# ifndef OPENSSL_NO_CHACHA
+#endif
+#ifndef OPENSSL_NO_CHACHA
 const EVP_CIPHER *EVP_chacha20(void);
-#  ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
 const EVP_CIPHER *EVP_chacha20_poly1305(void);
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_SEED
+#ifndef OPENSSL_NO_SEED
 const EVP_CIPHER *EVP_seed_ecb(void);
 const EVP_CIPHER *EVP_seed_cbc(void);
 const EVP_CIPHER *EVP_seed_cfb128(void);
-#  define EVP_seed_cfb EVP_seed_cfb128
+#define EVP_seed_cfb EVP_seed_cfb128
 const EVP_CIPHER *EVP_seed_ofb(void);
-# endif
+#endif
 
-# ifndef OPENSSL_NO_SM4
+#ifndef OPENSSL_NO_SM4
 const EVP_CIPHER *EVP_sm4_ecb(void);
 const EVP_CIPHER *EVP_sm4_cbc(void);
 const EVP_CIPHER *EVP_sm4_cfb128(void);
-#  define EVP_sm4_cfb EVP_sm4_cfb128
+#define EVP_sm4_cfb EVP_sm4_cfb128
 const EVP_CIPHER *EVP_sm4_ofb(void);
 const EVP_CIPHER *EVP_sm4_ctr(void);
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define OPENSSL_add_all_algorithms_conf() \
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define OPENSSL_add_all_algorithms_conf()            \
     OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS \
-                        | OPENSSL_INIT_LOAD_CONFIG, NULL)
-#  define OPENSSL_add_all_algorithms_noconf() \
+            | OPENSSL_INIT_ADD_ALL_DIGESTS           \
+            | OPENSSL_INIT_LOAD_CONFIG,              \
+        NULL)
+#define OPENSSL_add_all_algorithms_noconf()          \
     OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
-                        | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
+            | OPENSSL_INIT_ADD_ALL_DIGESTS,          \
+        NULL)
 
-#  ifdef OPENSSL_LOAD_CONF
-#   define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_conf()
-#  else
-#   define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_noconf()
-#  endif
+#ifdef OPENSSL_LOAD_CONF
+#define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_conf()
+#else
+#define OpenSSL_add_all_algorithms() OPENSSL_add_all_algorithms_noconf()
+#endif
 
-#  define OpenSSL_add_all_ciphers() \
+#define OpenSSL_add_all_ciphers() \
     OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS, NULL)
-#  define OpenSSL_add_all_digests() \
+#define OpenSSL_add_all_digests() \
     OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
 
-#  define EVP_cleanup() while(0) continue
-# endif
+#define EVP_cleanup() \
+    while (0)         \
+    continue
+#endif
 
 int EVP_add_cipher(const EVP_CIPHER *cipher);
 int EVP_add_digest(const EVP_MD *digest);
@@ -1228,30 +1219,30 @@ int EVP_add_digest(const EVP_MD *digest);
 const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
 const EVP_MD *EVP_get_digestbyname(const char *name);
 
-void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
-                                   const char *from, const char *to, void *x),
-                       void *arg);
-void EVP_CIPHER_do_all_sorted(void (*fn)
-                               (const EVP_CIPHER *ciph, const char *from,
-                                const char *to, void *x), void *arg);
+void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
+                           const char *from, const char *to, void *x),
+    void *arg);
+void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph, const char *from,
+                                  const char *to, void *x),
+    void *arg);
 void EVP_CIPHER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                void (*fn)(EVP_CIPHER *cipher, void *arg),
-                                void *arg);
+    void (*fn)(EVP_CIPHER *cipher, void *arg),
+    void *arg);
 
-void EVP_MD_do_all(void (*fn) (const EVP_MD *ciph,
-                               const char *from, const char *to, void *x),
-                   void *arg);
-void EVP_MD_do_all_sorted(void (*fn)
-                           (const EVP_MD *ciph, const char *from,
-                            const char *to, void *x), void *arg);
+void EVP_MD_do_all(void (*fn)(const EVP_MD *ciph,
+                       const char *from, const char *to, void *x),
+    void *arg);
+void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *ciph, const char *from,
+                              const char *to, void *x),
+    void *arg);
 void EVP_MD_do_all_provided(OSSL_LIB_CTX *libctx,
-                            void (*fn)(EVP_MD *md, void *arg),
-                            void *arg);
+    void (*fn)(EVP_MD *md, void *arg),
+    void *arg);
 
 /* MAC stuff */
 
 EVP_MAC *EVP_MAC_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
-                       const char *properties);
+    const char *properties);
 int EVP_MAC_up_ref(EVP_MAC *mac);
 void EVP_MAC_free(EVP_MAC *mac);
 const char *EVP_MAC_get0_name(const EVP_MAC *mac);
@@ -1270,16 +1261,16 @@ int EVP_MAC_CTX_set_params(EVP_MAC_CTX *ctx, const OSSL_PARAM params[]);
 size_t EVP_MAC_CTX_get_mac_size(EVP_MAC_CTX *ctx);
 size_t EVP_MAC_CTX_get_block_size(EVP_MAC_CTX *ctx);
 unsigned char *EVP_Q_mac(OSSL_LIB_CTX *libctx, const char *name, const char *propq,
-                         const char *subalg, const OSSL_PARAM *params,
-                         const void *key, size_t keylen,
-                         const unsigned char *data, size_t datalen,
-                         unsigned char *out, size_t outsize, size_t *outlen);
+    const char *subalg, const OSSL_PARAM *params,
+    const void *key, size_t keylen,
+    const unsigned char *data, size_t datalen,
+    unsigned char *out, size_t outsize, size_t *outlen);
 int EVP_MAC_init(EVP_MAC_CTX *ctx, const unsigned char *key, size_t keylen,
-                 const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int EVP_MAC_init_SKEY(EVP_MAC_CTX *ctx, EVP_SKEY *skey, const OSSL_PARAM params[]);
 int EVP_MAC_update(EVP_MAC_CTX *ctx, const unsigned char *data, size_t datalen);
 int EVP_MAC_final(EVP_MAC_CTX *ctx,
-                  unsigned char *out, size_t *outl, size_t outsize);
+    unsigned char *out, size_t *outl, size_t outsize);
 int EVP_MAC_finalXOF(EVP_MAC_CTX *ctx, unsigned char *out, size_t outsize);
 const OSSL_PARAM *EVP_MAC_gettable_params(const EVP_MAC *mac);
 const OSSL_PARAM *EVP_MAC_gettable_ctx_params(const EVP_MAC *mac);
@@ -1288,15 +1279,15 @@ const OSSL_PARAM *EVP_MAC_CTX_gettable_params(EVP_MAC_CTX *ctx);
 const OSSL_PARAM *EVP_MAC_CTX_settable_params(EVP_MAC_CTX *ctx);
 
 void EVP_MAC_do_all_provided(OSSL_LIB_CTX *libctx,
-                             void (*fn)(EVP_MAC *mac, void *arg),
-                             void *arg);
+    void (*fn)(EVP_MAC *mac, void *arg),
+    void *arg);
 int EVP_MAC_names_do_all(const EVP_MAC *mac,
-                         void (*fn)(const char *name, void *data),
-                         void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 
 /* RAND stuff */
 EVP_RAND *EVP_RAND_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
-                         const char *properties);
+    const char *properties);
 int EVP_RAND_up_ref(EVP_RAND *rand);
 void EVP_RAND_free(EVP_RAND *rand);
 const char *EVP_RAND_get0_name(const EVP_RAND *rand);
@@ -1318,24 +1309,24 @@ const OSSL_PARAM *EVP_RAND_CTX_gettable_params(EVP_RAND_CTX *ctx);
 const OSSL_PARAM *EVP_RAND_CTX_settable_params(EVP_RAND_CTX *ctx);
 
 void EVP_RAND_do_all_provided(OSSL_LIB_CTX *libctx,
-                              void (*fn)(EVP_RAND *rand, void *arg),
-                              void *arg);
+    void (*fn)(EVP_RAND *rand, void *arg),
+    void *arg);
 int EVP_RAND_names_do_all(const EVP_RAND *rand,
-                          void (*fn)(const char *name, void *data),
-                          void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 
 __owur int EVP_RAND_instantiate(EVP_RAND_CTX *ctx, unsigned int strength,
-                                int prediction_resistance,
-                                const unsigned char *pstr, size_t pstr_len,
-                                const OSSL_PARAM params[]);
+    int prediction_resistance,
+    const unsigned char *pstr, size_t pstr_len,
+    const OSSL_PARAM params[]);
 int EVP_RAND_uninstantiate(EVP_RAND_CTX *ctx);
 __owur int EVP_RAND_generate(EVP_RAND_CTX *ctx, unsigned char *out,
-                             size_t outlen, unsigned int strength,
-                             int prediction_resistance,
-                             const unsigned char *addin, size_t addin_len);
+    size_t outlen, unsigned int strength,
+    int prediction_resistance,
+    const unsigned char *addin, size_t addin_len);
 int EVP_RAND_reseed(EVP_RAND_CTX *ctx, int prediction_resistance,
-                    const unsigned char *ent, size_t ent_len,
-                    const unsigned char *addin, size_t addin_len);
+    const unsigned char *ent, size_t ent_len,
+    const unsigned char *addin, size_t addin_len);
 __owur int EVP_RAND_nonce(EVP_RAND_CTX *ctx, unsigned char *out, size_t outlen);
 __owur int EVP_RAND_enable_locking(EVP_RAND_CTX *ctx);
 
@@ -1343,60 +1334,60 @@ int EVP_RAND_verify_zeroization(EVP_RAND_CTX *ctx);
 unsigned int EVP_RAND_get_strength(EVP_RAND_CTX *ctx);
 int EVP_RAND_get_state(EVP_RAND_CTX *ctx);
 
-# define EVP_RAND_STATE_UNINITIALISED    0
-# define EVP_RAND_STATE_READY            1
-# define EVP_RAND_STATE_ERROR            2
+#define EVP_RAND_STATE_UNINITIALISED 0
+#define EVP_RAND_STATE_READY 1
+#define EVP_RAND_STATE_ERROR 2
 
 /* PKEY stuff */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int EVP_PKEY_decrypt_old(unsigned char *dec_key,
-                                          const unsigned char *enc_key,
-                                          int enc_key_len,
-                                          EVP_PKEY *private_key);
+    const unsigned char *enc_key,
+    int enc_key_len,
+    EVP_PKEY *private_key);
 OSSL_DEPRECATEDIN_3_0 int EVP_PKEY_encrypt_old(unsigned char *enc_key,
-                                          const unsigned char *key,
-                                          int key_len, EVP_PKEY *pub_key);
-# endif
+    const unsigned char *key,
+    int key_len, EVP_PKEY *pub_key);
+#endif
 int EVP_PKEY_is_a(const EVP_PKEY *pkey, const char *name);
 int EVP_PKEY_type_names_do_all(const EVP_PKEY *pkey,
-                               void (*fn)(const char *name, void *data),
-                               void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 int EVP_PKEY_type(int type);
 int EVP_PKEY_get_id(const EVP_PKEY *pkey);
-# define EVP_PKEY_id EVP_PKEY_get_id
+#define EVP_PKEY_id EVP_PKEY_get_id
 int EVP_PKEY_get_base_id(const EVP_PKEY *pkey);
-# define EVP_PKEY_base_id EVP_PKEY_get_base_id
+#define EVP_PKEY_base_id EVP_PKEY_get_base_id
 int EVP_PKEY_get_bits(const EVP_PKEY *pkey);
-# define EVP_PKEY_bits EVP_PKEY_get_bits
+#define EVP_PKEY_bits EVP_PKEY_get_bits
 int EVP_PKEY_get_security_bits(const EVP_PKEY *pkey);
-# define EVP_PKEY_security_bits EVP_PKEY_get_security_bits
+#define EVP_PKEY_security_bits EVP_PKEY_get_security_bits
 int EVP_PKEY_get_size(const EVP_PKEY *pkey);
-# define EVP_PKEY_size EVP_PKEY_get_size
+#define EVP_PKEY_size EVP_PKEY_get_size
 int EVP_PKEY_can_sign(const EVP_PKEY *pkey);
 int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
 int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
 int EVP_PKEY_set_type_by_keymgmt(EVP_PKEY *pkey, EVP_KEYMGMT *keymgmt);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_ENGINE
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e);
 OSSL_DEPRECATEDIN_3_0
 ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey);
-#  endif
+#endif
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
 OSSL_DEPRECATEDIN_3_0
 void *EVP_PKEY_get0(const EVP_PKEY *pkey);
 OSSL_DEPRECATEDIN_3_0
 const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len);
-#  ifndef OPENSSL_NO_POLY1305
+#ifndef OPENSSL_NO_POLY1305
 OSSL_DEPRECATEDIN_3_0
 const unsigned char *EVP_PKEY_get0_poly1305(const EVP_PKEY *pkey, size_t *len);
-#  endif
-#  ifndef OPENSSL_NO_SIPHASH
+#endif
+#ifndef OPENSSL_NO_SIPHASH
 OSSL_DEPRECATEDIN_3_0
 const unsigned char *EVP_PKEY_get0_siphash(const EVP_PKEY *pkey, size_t *len);
-#  endif
+#endif
 
 struct rsa_st;
 OSSL_DEPRECATEDIN_3_0
@@ -1406,7 +1397,7 @@ const struct rsa_st *EVP_PKEY_get0_RSA(const EVP_PKEY *pkey);
 OSSL_DEPRECATEDIN_3_0
 struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
 
-#  ifndef OPENSSL_NO_DSA
+#ifndef OPENSSL_NO_DSA
 struct dsa_st;
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, struct dsa_st *key);
@@ -1414,16 +1405,16 @@ OSSL_DEPRECATEDIN_3_0
 const struct dsa_st *EVP_PKEY_get0_DSA(const EVP_PKEY *pkey);
 OSSL_DEPRECATEDIN_3_0
 struct dsa_st *EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
-#  endif
+#endif
 
-#  ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DH
 struct dh_st;
 OSSL_DEPRECATEDIN_3_0 int EVP_PKEY_set1_DH(EVP_PKEY *pkey, struct dh_st *key);
 OSSL_DEPRECATEDIN_3_0 const struct dh_st *EVP_PKEY_get0_DH(const EVP_PKEY *pkey);
 OSSL_DEPRECATEDIN_3_0 struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
-#  endif
+#endif
 
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_EC
 struct ec_key_st;
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key);
@@ -1431,8 +1422,8 @@ OSSL_DEPRECATEDIN_3_0
 const struct ec_key_st *EVP_PKEY_get0_EC_KEY(const EVP_PKEY *pkey);
 OSSL_DEPRECATEDIN_3_0
 struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
-#  endif
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 EVP_PKEY *EVP_PKEY_new(void);
 int EVP_PKEY_up_ref(EVP_PKEY *pkey);
@@ -1442,25 +1433,24 @@ const char *EVP_PKEY_get0_description(const EVP_PKEY *pkey);
 const OSSL_PROVIDER *EVP_PKEY_get0_provider(const EVP_PKEY *key);
 
 EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length);
+    long length);
 int i2d_PublicKey(const EVP_PKEY *a, unsigned char **pp);
 
-
 EVP_PKEY *d2i_PrivateKey_ex(int type, EVP_PKEY **a, const unsigned char **pp,
-                            long length, OSSL_LIB_CTX *libctx,
-                            const char *propq);
+    long length, OSSL_LIB_CTX *libctx,
+    const char *propq);
 EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                         long length);
+    long length);
 EVP_PKEY *d2i_AutoPrivateKey_ex(EVP_PKEY **a, const unsigned char **pp,
-                                long length, OSSL_LIB_CTX *libctx,
-                                const char *propq);
+    long length, OSSL_LIB_CTX *libctx,
+    const char *propq);
 EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-                             long length);
+    long length);
 int i2d_PrivateKey(const EVP_PKEY *a, unsigned char **pp);
 
 int i2d_KeyParams(const EVP_PKEY *a, unsigned char **pp);
 EVP_PKEY *d2i_KeyParams(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length);
+    long length);
 int i2d_KeyParams_bio(BIO *bp, const EVP_PKEY *pkey);
 EVP_PKEY *d2i_KeyParams_bio(int type, EVP_PKEY **a, BIO *in);
 
@@ -1470,54 +1460,54 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode);
 int EVP_PKEY_parameters_eq(const EVP_PKEY *a, const EVP_PKEY *b);
 int EVP_PKEY_eq(const EVP_PKEY *a, const EVP_PKEY *b);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b);
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
-# endif
+#endif
 
 int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
+    int indent, ASN1_PCTX *pctx);
 int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-                           int indent, ASN1_PCTX *pctx);
+    int indent, ASN1_PCTX *pctx);
 int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-# ifndef OPENSSL_NO_STDIO
+    int indent, ASN1_PCTX *pctx);
+#ifndef OPENSSL_NO_STDIO
 int EVP_PKEY_print_public_fp(FILE *fp, const EVP_PKEY *pkey,
-                             int indent, ASN1_PCTX *pctx);
+    int indent, ASN1_PCTX *pctx);
 int EVP_PKEY_print_private_fp(FILE *fp, const EVP_PKEY *pkey,
-                              int indent, ASN1_PCTX *pctx);
+    int indent, ASN1_PCTX *pctx);
 int EVP_PKEY_print_params_fp(FILE *fp, const EVP_PKEY *pkey,
-                             int indent, ASN1_PCTX *pctx);
-# endif
+    int indent, ASN1_PCTX *pctx);
+#endif
 
 int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
 int EVP_PKEY_get_default_digest_name(EVP_PKEY *pkey,
-                                     char *mdname, size_t mdname_sz);
+    char *mdname, size_t mdname_sz);
 int EVP_PKEY_digestsign_supports_digest(EVP_PKEY *pkey, OSSL_LIB_CTX *libctx,
-                                        const char *name, const char *propq);
+    const char *name, const char *propq);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  * For backwards compatibility. Use EVP_PKEY_set1_encoded_public_key in
  * preference
  */
-#  define EVP_PKEY_set1_tls_encodedpoint(pkey, pt, ptlen) \
-          EVP_PKEY_set1_encoded_public_key((pkey), (pt), (ptlen))
-# endif
+#define EVP_PKEY_set1_tls_encodedpoint(pkey, pt, ptlen) \
+    EVP_PKEY_set1_encoded_public_key((pkey), (pt), (ptlen))
+#endif
 
 int EVP_PKEY_set1_encoded_public_key(EVP_PKEY *pkey,
-                                     const unsigned char *pub, size_t publen);
+    const unsigned char *pub, size_t publen);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  * For backwards compatibility. Use EVP_PKEY_get1_encoded_public_key in
  * preference
  */
-#  define EVP_PKEY_get1_tls_encodedpoint(pkey, ppt) \
-          EVP_PKEY_get1_encoded_public_key((pkey), (ppt))
-# endif
+#define EVP_PKEY_get1_tls_encodedpoint(pkey, ppt) \
+    EVP_PKEY_get1_encoded_public_key((pkey), (ppt))
+#endif
 
 size_t EVP_PKEY_get1_encoded_public_key(EVP_PKEY *pkey, unsigned char **ppub);
 
@@ -1531,201 +1521,201 @@ int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
 
 /* PKCS5 password based encryption */
 int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                       ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                       const EVP_MD *md, int en_de);
+    ASN1_TYPE *param, const EVP_CIPHER *cipher,
+    const EVP_MD *md, int en_de);
 int PKCS5_PBE_keyivgen_ex(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
-                          ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                          const EVP_MD *md, int en_de, OSSL_LIB_CTX *libctx,
-                          const char *propq);
+    ASN1_TYPE *param, const EVP_CIPHER *cipher,
+    const EVP_MD *md, int en_de, OSSL_LIB_CTX *libctx,
+    const char *propq);
 int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                           const unsigned char *salt, int saltlen, int iter,
-                           int keylen, unsigned char *out);
+    const unsigned char *salt, int saltlen, int iter,
+    int keylen, unsigned char *out);
 int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
-                      const unsigned char *salt, int saltlen, int iter,
-                      const EVP_MD *digest, int keylen, unsigned char *out);
+    const unsigned char *salt, int saltlen, int iter,
+    const EVP_MD *digest, int keylen, unsigned char *out);
 int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                          ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                          const EVP_MD *md, int en_de);
+    ASN1_TYPE *param, const EVP_CIPHER *cipher,
+    const EVP_MD *md, int en_de);
 int PKCS5_v2_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                             ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                             const EVP_MD *md, int en_de,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    ASN1_TYPE *param, const EVP_CIPHER *cipher,
+    const EVP_MD *md, int en_de,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 #ifndef OPENSSL_NO_SCRYPT
 int EVP_PBE_scrypt(const char *pass, size_t passlen,
-                   const unsigned char *salt, size_t saltlen,
-                   uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
-                   unsigned char *key, size_t keylen);
+    const unsigned char *salt, size_t saltlen,
+    uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
+    unsigned char *key, size_t keylen);
 int EVP_PBE_scrypt_ex(const char *pass, size_t passlen,
-                      const unsigned char *salt, size_t saltlen,
-                      uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
-                      unsigned char *key, size_t keylen,
-                      OSSL_LIB_CTX *ctx, const char *propq);
+    const unsigned char *salt, size_t saltlen,
+    uint64_t N, uint64_t r, uint64_t p, uint64_t maxmem,
+    unsigned char *key, size_t keylen,
+    OSSL_LIB_CTX *ctx, const char *propq);
 
 int PKCS5_v2_scrypt_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass,
-                             int passlen, ASN1_TYPE *param,
-                             const EVP_CIPHER *c, const EVP_MD *md, int en_de);
+    int passlen, ASN1_TYPE *param,
+    const EVP_CIPHER *c, const EVP_MD *md, int en_de);
 int PKCS5_v2_scrypt_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass,
-                                int passlen, ASN1_TYPE *param,
-                                const EVP_CIPHER *c, const EVP_MD *md, int en_de,
-                                OSSL_LIB_CTX *libctx, const char *propq);
+    int passlen, ASN1_TYPE *param,
+    const EVP_CIPHER *c, const EVP_MD *md, int en_de,
+    OSSL_LIB_CTX *libctx, const char *propq);
 #endif
 
 void PKCS5_PBE_add(void);
 
 int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-                       ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
+    ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
 
 int EVP_PBE_CipherInit_ex(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-                          ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de,
-                          OSSL_LIB_CTX *libctx, const char *propq);
+    ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 /* PBE type */
 
 /* Can appear as the outermost AlgorithmIdentifier */
-# define EVP_PBE_TYPE_OUTER      0x0
+#define EVP_PBE_TYPE_OUTER 0x0
 /* Is an PRF type OID */
-# define EVP_PBE_TYPE_PRF        0x1
+#define EVP_PBE_TYPE_PRF 0x1
 /* Is a PKCS#5 v2.0 KDF */
-# define EVP_PBE_TYPE_KDF        0x2
+#define EVP_PBE_TYPE_KDF 0x2
 
 int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
-                         int md_nid, EVP_PBE_KEYGEN *keygen);
+    int md_nid, EVP_PBE_KEYGEN *keygen);
 int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
-                    EVP_PBE_KEYGEN *keygen);
+    EVP_PBE_KEYGEN *keygen);
 int EVP_PBE_find(int type, int pbe_nid, int *pcnid, int *pmnid,
-                 EVP_PBE_KEYGEN **pkeygen);
+    EVP_PBE_KEYGEN **pkeygen);
 int EVP_PBE_find_ex(int type, int pbe_nid, int *pcnid, int *pmnid,
-                    EVP_PBE_KEYGEN **pkeygen, EVP_PBE_KEYGEN_EX **pkeygen_ex);
+    EVP_PBE_KEYGEN **pkeygen, EVP_PBE_KEYGEN_EX **pkeygen_ex);
 void EVP_PBE_cleanup(void);
 int EVP_PBE_get(int *ptype, int *ppbe_nid, size_t num);
 
-# define ASN1_PKEY_ALIAS         0x1
-# define ASN1_PKEY_DYNAMIC       0x2
-# define ASN1_PKEY_SIGPARAM_NULL 0x4
+#define ASN1_PKEY_ALIAS 0x1
+#define ASN1_PKEY_DYNAMIC 0x2
+#define ASN1_PKEY_SIGPARAM_NULL 0x4
 
-# define ASN1_PKEY_CTRL_PKCS7_SIGN       0x1
-# define ASN1_PKEY_CTRL_PKCS7_ENCRYPT    0x2
-# define ASN1_PKEY_CTRL_DEFAULT_MD_NID   0x3
-# define ASN1_PKEY_CTRL_CMS_SIGN         0x5
-# define ASN1_PKEY_CTRL_CMS_ENVELOPE     0x7
-# define ASN1_PKEY_CTRL_CMS_RI_TYPE      0x8
+#define ASN1_PKEY_CTRL_PKCS7_SIGN 0x1
+#define ASN1_PKEY_CTRL_PKCS7_ENCRYPT 0x2
+#define ASN1_PKEY_CTRL_DEFAULT_MD_NID 0x3
+#define ASN1_PKEY_CTRL_CMS_SIGN 0x5
+#define ASN1_PKEY_CTRL_CMS_ENVELOPE 0x7
+#define ASN1_PKEY_CTRL_CMS_RI_TYPE 0x8
 
-# define ASN1_PKEY_CTRL_SET1_TLS_ENCPT   0x9
-# define ASN1_PKEY_CTRL_GET1_TLS_ENCPT   0xa
-# define ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED 0xb
+#define ASN1_PKEY_CTRL_SET1_TLS_ENCPT 0x9
+#define ASN1_PKEY_CTRL_GET1_TLS_ENCPT 0xa
+#define ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED 0xb
 
 int EVP_PKEY_asn1_get_count(void);
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx);
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type);
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
-                                                   const char *str, int len);
+    const char *str, int len);
 int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth);
 int EVP_PKEY_asn1_add_alias(int to, int from);
 int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id,
-                            int *ppkey_flags, const char **pinfo,
-                            const char **ppem_str,
-                            const EVP_PKEY_ASN1_METHOD *ameth);
+    int *ppkey_flags, const char **pinfo,
+    const char **ppem_str,
+    const EVP_PKEY_ASN1_METHOD *ameth);
 
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(const EVP_PKEY *pkey);
 EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
-                                        const char *pem_str,
-                                        const char *info);
+    const char *pem_str,
+    const char *info);
 void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
-                        const EVP_PKEY_ASN1_METHOD *src);
+    const EVP_PKEY_ASN1_METHOD *src);
 void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
 void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
-                              int (*pub_decode) (EVP_PKEY *pk,
-                                                 const X509_PUBKEY *pub),
-                              int (*pub_encode) (X509_PUBKEY *pub,
-                                                 const EVP_PKEY *pk),
-                              int (*pub_cmp) (const EVP_PKEY *a,
-                                              const EVP_PKEY *b),
-                              int (*pub_print) (BIO *out,
-                                                const EVP_PKEY *pkey,
-                                                int indent, ASN1_PCTX *pctx),
-                              int (*pkey_size) (const EVP_PKEY *pk),
-                              int (*pkey_bits) (const EVP_PKEY *pk));
+    int (*pub_decode)(EVP_PKEY *pk,
+        const X509_PUBKEY *pub),
+    int (*pub_encode)(X509_PUBKEY *pub,
+        const EVP_PKEY *pk),
+    int (*pub_cmp)(const EVP_PKEY *a,
+        const EVP_PKEY *b),
+    int (*pub_print)(BIO *out,
+        const EVP_PKEY *pkey,
+        int indent, ASN1_PCTX *pctx),
+    int (*pkey_size)(const EVP_PKEY *pk),
+    int (*pkey_bits)(const EVP_PKEY *pk));
 void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
-                               int (*priv_decode) (EVP_PKEY *pk,
-                                                   const PKCS8_PRIV_KEY_INFO
-                                                   *p8inf),
-                               int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,
-                                                   const EVP_PKEY *pk),
-                               int (*priv_print) (BIO *out,
-                                                  const EVP_PKEY *pkey,
-                                                  int indent,
-                                                  ASN1_PCTX *pctx));
+    int (*priv_decode)(EVP_PKEY *pk,
+        const PKCS8_PRIV_KEY_INFO
+            *p8inf),
+    int (*priv_encode)(PKCS8_PRIV_KEY_INFO *p8,
+        const EVP_PKEY *pk),
+    int (*priv_print)(BIO *out,
+        const EVP_PKEY *pkey,
+        int indent,
+        ASN1_PCTX *pctx));
 void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-                             int (*param_decode) (EVP_PKEY *pkey,
-                                                  const unsigned char **pder,
-                                                  int derlen),
-                             int (*param_encode) (const EVP_PKEY *pkey,
-                                                  unsigned char **pder),
-                             int (*param_missing) (const EVP_PKEY *pk),
-                             int (*param_copy) (EVP_PKEY *to,
-                                                const EVP_PKEY *from),
-                             int (*param_cmp) (const EVP_PKEY *a,
-                                               const EVP_PKEY *b),
-                             int (*param_print) (BIO *out,
-                                                 const EVP_PKEY *pkey,
-                                                 int indent,
-                                                 ASN1_PCTX *pctx));
+    int (*param_decode)(EVP_PKEY *pkey,
+        const unsigned char **pder,
+        int derlen),
+    int (*param_encode)(const EVP_PKEY *pkey,
+        unsigned char **pder),
+    int (*param_missing)(const EVP_PKEY *pk),
+    int (*param_copy)(EVP_PKEY *to,
+        const EVP_PKEY *from),
+    int (*param_cmp)(const EVP_PKEY *a,
+        const EVP_PKEY *b),
+    int (*param_print)(BIO *out,
+        const EVP_PKEY *pkey,
+        int indent,
+        ASN1_PCTX *pctx));
 
 void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-                            void (*pkey_free) (EVP_PKEY *pkey));
+    void (*pkey_free)(EVP_PKEY *pkey));
 void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
-                                              long arg1, void *arg2));
+    int (*pkey_ctrl)(EVP_PKEY *pkey, int op,
+        long arg1, void *arg2));
 void EVP_PKEY_asn1_set_item(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*item_verify) (EVP_MD_CTX *ctx,
-                                                const ASN1_ITEM *it,
-                                                const void *data,
-                                                const X509_ALGOR *a,
-                                                const ASN1_BIT_STRING *sig,
-                                                EVP_PKEY *pkey),
-                            int (*item_sign) (EVP_MD_CTX *ctx,
-                                              const ASN1_ITEM *it,
-                                              const void *data,
-                                              X509_ALGOR *alg1,
-                                              X509_ALGOR *alg2,
-                                              ASN1_BIT_STRING *sig));
+    int (*item_verify)(EVP_MD_CTX *ctx,
+        const ASN1_ITEM *it,
+        const void *data,
+        const X509_ALGOR *a,
+        const ASN1_BIT_STRING *sig,
+        EVP_PKEY *pkey),
+    int (*item_sign)(EVP_MD_CTX *ctx,
+        const ASN1_ITEM *it,
+        const void *data,
+        X509_ALGOR *alg1,
+        X509_ALGOR *alg2,
+        ASN1_BIT_STRING *sig));
 
 void EVP_PKEY_asn1_set_siginf(EVP_PKEY_ASN1_METHOD *ameth,
-                              int (*siginf_set) (X509_SIG_INFO *siginf,
-                                                 const X509_ALGOR *alg,
-                                                 const ASN1_STRING *sig));
+    int (*siginf_set)(X509_SIG_INFO *siginf,
+        const X509_ALGOR *alg,
+        const ASN1_STRING *sig));
 
 void EVP_PKEY_asn1_set_check(EVP_PKEY_ASN1_METHOD *ameth,
-                             int (*pkey_check) (const EVP_PKEY *pk));
+    int (*pkey_check)(const EVP_PKEY *pk));
 
 void EVP_PKEY_asn1_set_public_check(EVP_PKEY_ASN1_METHOD *ameth,
-                                    int (*pkey_pub_check) (const EVP_PKEY *pk));
+    int (*pkey_pub_check)(const EVP_PKEY *pk));
 
 void EVP_PKEY_asn1_set_param_check(EVP_PKEY_ASN1_METHOD *ameth,
-                                   int (*pkey_param_check) (const EVP_PKEY *pk));
+    int (*pkey_param_check)(const EVP_PKEY *pk));
 
 void EVP_PKEY_asn1_set_set_priv_key(EVP_PKEY_ASN1_METHOD *ameth,
-                                    int (*set_priv_key) (EVP_PKEY *pk,
-                                                         const unsigned char
-                                                            *priv,
-                                                         size_t len));
+    int (*set_priv_key)(EVP_PKEY *pk,
+        const unsigned char
+            *priv,
+        size_t len));
 void EVP_PKEY_asn1_set_set_pub_key(EVP_PKEY_ASN1_METHOD *ameth,
-                                   int (*set_pub_key) (EVP_PKEY *pk,
-                                                       const unsigned char *pub,
-                                                       size_t len));
+    int (*set_pub_key)(EVP_PKEY *pk,
+        const unsigned char *pub,
+        size_t len));
 void EVP_PKEY_asn1_set_get_priv_key(EVP_PKEY_ASN1_METHOD *ameth,
-                                    int (*get_priv_key) (const EVP_PKEY *pk,
-                                                         unsigned char *priv,
-                                                         size_t *len));
+    int (*get_priv_key)(const EVP_PKEY *pk,
+        unsigned char *priv,
+        size_t *len));
 void EVP_PKEY_asn1_set_get_pub_key(EVP_PKEY_ASN1_METHOD *ameth,
-                                   int (*get_pub_key) (const EVP_PKEY *pk,
-                                                       unsigned char *pub,
-                                                       size_t *len));
+    int (*get_pub_key)(const EVP_PKEY *pk,
+        unsigned char *pub,
+        size_t *len));
 
 void EVP_PKEY_asn1_set_security_bits(EVP_PKEY_ASN1_METHOD *ameth,
-                                     int (*pkey_security_bits) (const EVP_PKEY
-                                                                *pk));
+    int (*pkey_security_bits)(const EVP_PKEY
+            *pk));
 
 int EVP_PKEY_CTX_get_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD **md);
 int EVP_PKEY_CTX_set_signature_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
@@ -1738,96 +1728,96 @@ int EVP_PKEY_CTX_set_kem_op(EVP_PKEY_CTX *ctx, const char *op);
 
 const char *EVP_PKEY_get0_type_name(const EVP_PKEY *key);
 
-# define EVP_PKEY_OP_UNDEFINED           0
-# define EVP_PKEY_OP_PARAMGEN            (1 << 1)
-# define EVP_PKEY_OP_KEYGEN              (1 << 2)
-# define EVP_PKEY_OP_FROMDATA            (1 << 3)
-# define EVP_PKEY_OP_SIGN                (1 << 4)
-# define EVP_PKEY_OP_VERIFY              (1 << 5)
-# define EVP_PKEY_OP_VERIFYRECOVER       (1 << 6)
-# define EVP_PKEY_OP_SIGNCTX             (1 << 7)
-# define EVP_PKEY_OP_VERIFYCTX           (1 << 8)
-# define EVP_PKEY_OP_ENCRYPT             (1 << 9)
-# define EVP_PKEY_OP_DECRYPT             (1 << 10)
-# define EVP_PKEY_OP_DERIVE              (1 << 11)
-# define EVP_PKEY_OP_ENCAPSULATE         (1 << 12)
-# define EVP_PKEY_OP_DECAPSULATE         (1 << 13)
-# define EVP_PKEY_OP_SIGNMSG             (1 << 14)
-# define EVP_PKEY_OP_VERIFYMSG           (1 << 15)
+#define EVP_PKEY_OP_UNDEFINED 0
+#define EVP_PKEY_OP_PARAMGEN (1 << 1)
+#define EVP_PKEY_OP_KEYGEN (1 << 2)
+#define EVP_PKEY_OP_FROMDATA (1 << 3)
+#define EVP_PKEY_OP_SIGN (1 << 4)
+#define EVP_PKEY_OP_VERIFY (1 << 5)
+#define EVP_PKEY_OP_VERIFYRECOVER (1 << 6)
+#define EVP_PKEY_OP_SIGNCTX (1 << 7)
+#define EVP_PKEY_OP_VERIFYCTX (1 << 8)
+#define EVP_PKEY_OP_ENCRYPT (1 << 9)
+#define EVP_PKEY_OP_DECRYPT (1 << 10)
+#define EVP_PKEY_OP_DERIVE (1 << 11)
+#define EVP_PKEY_OP_ENCAPSULATE (1 << 12)
+#define EVP_PKEY_OP_DECAPSULATE (1 << 13)
+#define EVP_PKEY_OP_SIGNMSG (1 << 14)
+#define EVP_PKEY_OP_VERIFYMSG (1 << 15)
 /* Update the following when adding new EVP_PKEY_OPs */
-# define EVP_PKEY_OP_ALL                ((1 << 16) - 1)
+#define EVP_PKEY_OP_ALL ((1 << 16) - 1)
 
-# define EVP_PKEY_OP_TYPE_SIG                                           \
-    (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG                             \
-     | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYMSG                       \
-     | EVP_PKEY_OP_VERIFYRECOVER                                        \
-     | EVP_PKEY_OP_SIGNCTX | EVP_PKEY_OP_VERIFYCTX)
+#define EVP_PKEY_OP_TYPE_SIG                         \
+    (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_SIGNMSG          \
+        | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYMSG \
+        | EVP_PKEY_OP_VERIFYRECOVER                  \
+        | EVP_PKEY_OP_SIGNCTX | EVP_PKEY_OP_VERIFYCTX)
 
-# define EVP_PKEY_OP_TYPE_CRYPT                                         \
+#define EVP_PKEY_OP_TYPE_CRYPT \
     (EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT)
 
-# define EVP_PKEY_OP_TYPE_DERIVE                                        \
+#define EVP_PKEY_OP_TYPE_DERIVE \
     (EVP_PKEY_OP_DERIVE)
 
-# define EVP_PKEY_OP_TYPE_DATA                                          \
+#define EVP_PKEY_OP_TYPE_DATA \
     (EVP_PKEY_OP_FROMDATA)
 
-# define EVP_PKEY_OP_TYPE_KEM                                           \
+#define EVP_PKEY_OP_TYPE_KEM \
     (EVP_PKEY_OP_ENCAPSULATE | EVP_PKEY_OP_DECAPSULATE)
 
-# define EVP_PKEY_OP_TYPE_GEN                                           \
+#define EVP_PKEY_OP_TYPE_GEN \
     (EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN)
 
-# define EVP_PKEY_OP_TYPE_NOGEN                                         \
+#define EVP_PKEY_OP_TYPE_NOGEN \
     (EVP_PKEY_OP_ALL & ~EVP_PKEY_OP_TYPE_GEN)
 
 int EVP_PKEY_CTX_set_mac_key(EVP_PKEY_CTX *ctx, const unsigned char *key,
-                             int keylen);
+    int keylen);
 
-# define EVP_PKEY_CTRL_MD                1
-# define EVP_PKEY_CTRL_PEER_KEY          2
-# define EVP_PKEY_CTRL_SET_MAC_KEY       6
-# define EVP_PKEY_CTRL_DIGESTINIT        7
+#define EVP_PKEY_CTRL_MD 1
+#define EVP_PKEY_CTRL_PEER_KEY 2
+#define EVP_PKEY_CTRL_SET_MAC_KEY 6
+#define EVP_PKEY_CTRL_DIGESTINIT 7
 /* Used by GOST key encryption in TLS */
-# define EVP_PKEY_CTRL_SET_IV            8
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define EVP_PKEY_CTRL_PKCS7_ENCRYPT     3
-#  define EVP_PKEY_CTRL_PKCS7_DECRYPT     4
-#  define EVP_PKEY_CTRL_PKCS7_SIGN        5
-#  define EVP_PKEY_CTRL_CMS_ENCRYPT       9
-#  define EVP_PKEY_CTRL_CMS_DECRYPT       10
-#  define EVP_PKEY_CTRL_CMS_SIGN          11
-# endif
-# define EVP_PKEY_CTRL_CIPHER            12
-# define EVP_PKEY_CTRL_GET_MD            13
-# define EVP_PKEY_CTRL_SET_DIGEST_SIZE   14
-# define EVP_PKEY_CTRL_SET1_ID           15
-# define EVP_PKEY_CTRL_GET1_ID           16
-# define EVP_PKEY_CTRL_GET1_ID_LEN       17
+#define EVP_PKEY_CTRL_SET_IV 8
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define EVP_PKEY_CTRL_PKCS7_ENCRYPT 3
+#define EVP_PKEY_CTRL_PKCS7_DECRYPT 4
+#define EVP_PKEY_CTRL_PKCS7_SIGN 5
+#define EVP_PKEY_CTRL_CMS_ENCRYPT 9
+#define EVP_PKEY_CTRL_CMS_DECRYPT 10
+#define EVP_PKEY_CTRL_CMS_SIGN 11
+#endif
+#define EVP_PKEY_CTRL_CIPHER 12
+#define EVP_PKEY_CTRL_GET_MD 13
+#define EVP_PKEY_CTRL_SET_DIGEST_SIZE 14
+#define EVP_PKEY_CTRL_SET1_ID 15
+#define EVP_PKEY_CTRL_GET1_ID 16
+#define EVP_PKEY_CTRL_GET1_ID_LEN 17
 
-# define EVP_PKEY_ALG_CTRL               0x1000
+#define EVP_PKEY_ALG_CTRL 0x1000
 
-# define EVP_PKEY_FLAG_AUTOARGLEN        2
+#define EVP_PKEY_FLAG_AUTOARGLEN 2
 /*
  * Method handles all operations: don't assume any digest related defaults.
  */
-# define EVP_PKEY_FLAG_SIGCTX_CUSTOM     4
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#define EVP_PKEY_FLAG_SIGCTX_CUSTOM 4
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
 OSSL_DEPRECATEDIN_3_0 EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
 OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
-                                              const EVP_PKEY_METHOD *meth);
+    const EVP_PKEY_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst,
-                                         const EVP_PKEY_METHOD *src);
+    const EVP_PKEY_METHOD *src);
 OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
 OSSL_DEPRECATEDIN_3_0 int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
 OSSL_DEPRECATEDIN_3_0 int EVP_PKEY_meth_remove(const EVP_PKEY_METHOD *pmeth);
 OSSL_DEPRECATEDIN_3_0 size_t EVP_PKEY_meth_get_count(void);
 OSSL_DEPRECATEDIN_3_0 const EVP_PKEY_METHOD *EVP_PKEY_meth_get0(size_t idx);
-# endif
+#endif
 
 EVP_KEYMGMT *EVP_KEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                               const char *properties);
+    const char *properties);
 int EVP_KEYMGMT_up_ref(EVP_KEYMGMT *keymgmt);
 void EVP_KEYMGMT_free(EVP_KEYMGMT *keymgmt);
 const OSSL_PROVIDER *EVP_KEYMGMT_get0_provider(const EVP_KEYMGMT *keymgmt);
@@ -1835,18 +1825,18 @@ const char *EVP_KEYMGMT_get0_name(const EVP_KEYMGMT *keymgmt);
 const char *EVP_KEYMGMT_get0_description(const EVP_KEYMGMT *keymgmt);
 int EVP_KEYMGMT_is_a(const EVP_KEYMGMT *keymgmt, const char *name);
 void EVP_KEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
-                                 void (*fn)(EVP_KEYMGMT *keymgmt, void *arg),
-                                 void *arg);
+    void (*fn)(EVP_KEYMGMT *keymgmt, void *arg),
+    void *arg);
 int EVP_KEYMGMT_names_do_all(const EVP_KEYMGMT *keymgmt,
-                             void (*fn)(const char *name, void *data),
-                             void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *EVP_KEYMGMT_gettable_params(const EVP_KEYMGMT *keymgmt);
 const OSSL_PARAM *EVP_KEYMGMT_settable_params(const EVP_KEYMGMT *keymgmt);
 const OSSL_PARAM *EVP_KEYMGMT_gen_settable_params(const EVP_KEYMGMT *keymgmt);
 const OSSL_PARAM *EVP_KEYMGMT_gen_gettable_params(const EVP_KEYMGMT *keymgmt);
 
 EVP_SKEYMGMT *EVP_SKEYMGMT_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                                 const char *properties);
+    const char *properties);
 int EVP_SKEYMGMT_up_ref(EVP_SKEYMGMT *keymgmt);
 void EVP_SKEYMGMT_free(EVP_SKEYMGMT *keymgmt);
 const OSSL_PROVIDER *EVP_SKEYMGMT_get0_provider(const EVP_SKEYMGMT *keymgmt);
@@ -1854,21 +1844,21 @@ const char *EVP_SKEYMGMT_get0_name(const EVP_SKEYMGMT *keymgmt);
 const char *EVP_SKEYMGMT_get0_description(const EVP_SKEYMGMT *keymgmt);
 int EVP_SKEYMGMT_is_a(const EVP_SKEYMGMT *keymgmt, const char *name);
 void EVP_SKEYMGMT_do_all_provided(OSSL_LIB_CTX *libctx,
-                                  void (*fn)(EVP_SKEYMGMT *keymgmt, void *arg),
-                                  void *arg);
+    void (*fn)(EVP_SKEYMGMT *keymgmt, void *arg),
+    void *arg);
 int EVP_SKEYMGMT_names_do_all(const EVP_SKEYMGMT *keymgmt,
-                              void (*fn)(const char *name, void *data),
-                              void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *EVP_SKEYMGMT_get0_gen_settable_params(const EVP_SKEYMGMT *skeymgmt);
 const OSSL_PARAM *EVP_SKEYMGMT_get0_imp_settable_params(const EVP_SKEYMGMT *skeymgmt);
 
 EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
 EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e);
 EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_name(OSSL_LIB_CTX *libctx,
-                                         const char *name,
-                                         const char *propquery);
+    const char *name,
+    const char *propquery);
 EVP_PKEY_CTX *EVP_PKEY_CTX_new_from_pkey(OSSL_LIB_CTX *libctx,
-                                         EVP_PKEY *pkey, const char *propquery);
+    EVP_PKEY *pkey, const char *propquery);
 EVP_PKEY_CTX *EVP_PKEY_CTX_dup(const EVP_PKEY_CTX *ctx);
 void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_CTX_is_a(EVP_PKEY_CTX *ctx, const char *keytype);
@@ -1883,11 +1873,11 @@ int EVP_PKEY_CTX_get_algor_params(EVP_PKEY_CTX *ctx, X509_ALGOR *alg);
 int EVP_PKEY_CTX_get_algor(EVP_PKEY_CTX *ctx, X509_ALGOR **alg);
 
 int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                      int cmd, int p1, void *p2);
+    int cmd, int p1, void *p2);
 int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-                          const char *value);
+    const char *value);
 int EVP_PKEY_CTX_ctrl_uint64(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                             int cmd, uint64_t value);
+    int cmd, uint64_t value);
 
 int EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str);
 int EVP_PKEY_CTX_hex2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *hex);
@@ -1898,30 +1888,30 @@ int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
 void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
 
 EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                               const unsigned char *key, int keylen);
+    const unsigned char *key, int keylen);
 EVP_PKEY *EVP_PKEY_new_raw_private_key_ex(OSSL_LIB_CTX *libctx,
-                                          const char *keytype,
-                                          const char *propq,
-                                          const unsigned char *priv, size_t len);
+    const char *keytype,
+    const char *propq,
+    const unsigned char *priv, size_t len);
 EVP_PKEY *EVP_PKEY_new_raw_private_key(int type, ENGINE *e,
-                                       const unsigned char *priv,
-                                       size_t len);
+    const unsigned char *priv,
+    size_t len);
 EVP_PKEY *EVP_PKEY_new_raw_public_key_ex(OSSL_LIB_CTX *libctx,
-                                         const char *keytype, const char *propq,
-                                         const unsigned char *pub, size_t len);
+    const char *keytype, const char *propq,
+    const unsigned char *pub, size_t len);
 EVP_PKEY *EVP_PKEY_new_raw_public_key(int type, ENGINE *e,
-                                      const unsigned char *pub,
-                                      size_t len);
+    const unsigned char *pub,
+    size_t len);
 int EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv,
-                                 size_t *len);
+    size_t *len);
 int EVP_PKEY_get_raw_public_key(const EVP_PKEY *pkey, unsigned char *pub,
-                                size_t *len);
+    size_t *len);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 EVP_PKEY *EVP_PKEY_new_CMAC_key(ENGINE *e, const unsigned char *priv,
-                                size_t len, const EVP_CIPHER *cipher);
-# endif
+    size_t len, const EVP_CIPHER *cipher);
+#endif
 
 void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
 void *EVP_PKEY_CTX_get_data(const EVP_PKEY_CTX *ctx);
@@ -1933,23 +1923,23 @@ void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data);
 void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx);
 
 int EVP_PKEY_CTX_set_signature(EVP_PKEY_CTX *pctx,
-                               const unsigned char *sig, size_t siglen);
+    const unsigned char *sig, size_t siglen);
 
 void EVP_SIGNATURE_free(EVP_SIGNATURE *signature);
 int EVP_SIGNATURE_up_ref(EVP_SIGNATURE *signature);
 OSSL_PROVIDER *EVP_SIGNATURE_get0_provider(const EVP_SIGNATURE *signature);
 EVP_SIGNATURE *EVP_SIGNATURE_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                                   const char *properties);
+    const char *properties);
 int EVP_SIGNATURE_is_a(const EVP_SIGNATURE *signature, const char *name);
 const char *EVP_SIGNATURE_get0_name(const EVP_SIGNATURE *signature);
 const char *EVP_SIGNATURE_get0_description(const EVP_SIGNATURE *signature);
 void EVP_SIGNATURE_do_all_provided(OSSL_LIB_CTX *libctx,
-                                   void (*fn)(EVP_SIGNATURE *signature,
-                                              void *data),
-                                   void *data);
+    void (*fn)(EVP_SIGNATURE *signature,
+        void *data),
+    void *data);
 int EVP_SIGNATURE_names_do_all(const EVP_SIGNATURE *signature,
-                               void (*fn)(const char *name, void *data),
-                               void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *EVP_SIGNATURE_gettable_ctx_params(const EVP_SIGNATURE *sig);
 const OSSL_PARAM *EVP_SIGNATURE_settable_ctx_params(const EVP_SIGNATURE *sig);
 
@@ -1957,17 +1947,17 @@ void EVP_ASYM_CIPHER_free(EVP_ASYM_CIPHER *cipher);
 int EVP_ASYM_CIPHER_up_ref(EVP_ASYM_CIPHER *cipher);
 OSSL_PROVIDER *EVP_ASYM_CIPHER_get0_provider(const EVP_ASYM_CIPHER *cipher);
 EVP_ASYM_CIPHER *EVP_ASYM_CIPHER_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                                       const char *properties);
+    const char *properties);
 int EVP_ASYM_CIPHER_is_a(const EVP_ASYM_CIPHER *cipher, const char *name);
 const char *EVP_ASYM_CIPHER_get0_name(const EVP_ASYM_CIPHER *cipher);
 const char *EVP_ASYM_CIPHER_get0_description(const EVP_ASYM_CIPHER *cipher);
 void EVP_ASYM_CIPHER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                     void (*fn)(EVP_ASYM_CIPHER *cipher,
-                                                void *arg),
-                                     void *arg);
+    void (*fn)(EVP_ASYM_CIPHER *cipher,
+        void *arg),
+    void *arg);
 int EVP_ASYM_CIPHER_names_do_all(const EVP_ASYM_CIPHER *cipher,
-                                 void (*fn)(const char *name, void *data),
-                                 void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *EVP_ASYM_CIPHER_gettable_ctx_params(const EVP_ASYM_CIPHER *ciph);
 const OSSL_PARAM *EVP_ASYM_CIPHER_settable_ctx_params(const EVP_ASYM_CIPHER *ciph);
 
@@ -1975,122 +1965,122 @@ void EVP_KEM_free(EVP_KEM *wrap);
 int EVP_KEM_up_ref(EVP_KEM *wrap);
 OSSL_PROVIDER *EVP_KEM_get0_provider(const EVP_KEM *wrap);
 EVP_KEM *EVP_KEM_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                       const char *properties);
+    const char *properties);
 int EVP_KEM_is_a(const EVP_KEM *wrap, const char *name);
 const char *EVP_KEM_get0_name(const EVP_KEM *wrap);
 const char *EVP_KEM_get0_description(const EVP_KEM *wrap);
 void EVP_KEM_do_all_provided(OSSL_LIB_CTX *libctx,
-                             void (*fn)(EVP_KEM *wrap, void *arg), void *arg);
+    void (*fn)(EVP_KEM *wrap, void *arg), void *arg);
 int EVP_KEM_names_do_all(const EVP_KEM *wrap,
-                         void (*fn)(const char *name, void *data), void *data);
+    void (*fn)(const char *name, void *data), void *data);
 const OSSL_PARAM *EVP_KEM_gettable_ctx_params(const EVP_KEM *kem);
 const OSSL_PARAM *EVP_KEM_settable_ctx_params(const EVP_KEM *kem);
 
 int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_sign_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_sign_init_ex2(EVP_PKEY_CTX *ctx,
-                           EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
+    EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
 int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
-                  unsigned char *sig, size_t *siglen,
-                  const unsigned char *tbs, size_t tbslen);
+    unsigned char *sig, size_t *siglen,
+    const unsigned char *tbs, size_t tbslen);
 int EVP_PKEY_sign_message_init(EVP_PKEY_CTX *ctx,
-                               EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
+    EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
 int EVP_PKEY_sign_message_update(EVP_PKEY_CTX *ctx,
-                                 const unsigned char *in, size_t inlen);
+    const unsigned char *in, size_t inlen);
 int EVP_PKEY_sign_message_final(EVP_PKEY_CTX *ctx,
-                                unsigned char *sig, size_t *siglen);
+    unsigned char *sig, size_t *siglen);
 int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_verify_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_verify_init_ex2(EVP_PKEY_CTX *ctx,
-                             EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
+    EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
 int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
-                    const unsigned char *sig, size_t siglen,
-                    const unsigned char *tbs, size_t tbslen);
+    const unsigned char *sig, size_t siglen,
+    const unsigned char *tbs, size_t tbslen);
 int EVP_PKEY_verify_message_init(EVP_PKEY_CTX *ctx,
-                                 EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
+    EVP_SIGNATURE *algo, const OSSL_PARAM params[]);
 int EVP_PKEY_verify_message_update(EVP_PKEY_CTX *ctx,
-                                   const unsigned char *in, size_t inlen);
+    const unsigned char *in, size_t inlen);
 int EVP_PKEY_verify_message_final(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_verify_recover_init_ex(EVP_PKEY_CTX *ctx,
-                                    const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int EVP_PKEY_verify_recover_init_ex2(EVP_PKEY_CTX *ctx,
-                                     EVP_SIGNATURE *algo,
-                                     const OSSL_PARAM params[]);
+    EVP_SIGNATURE *algo,
+    const OSSL_PARAM params[]);
 int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
-                            unsigned char *rout, size_t *routlen,
-                            const unsigned char *sig, size_t siglen);
+    unsigned char *rout, size_t *routlen,
+    const unsigned char *sig, size_t siglen);
 int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_encrypt_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
+    unsigned char *out, size_t *outlen,
+    const unsigned char *in, size_t inlen);
 int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_decrypt_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
+    unsigned char *out, size_t *outlen,
+    const unsigned char *in, size_t inlen);
 
 int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_derive_init_ex(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_derive_set_peer_ex(EVP_PKEY_CTX *ctx, EVP_PKEY *peer,
-                                int validate_peer);
+    int validate_peer);
 int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer);
 int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
 
 int EVP_PKEY_encapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_auth_encapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpriv,
-                                   const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int EVP_PKEY_encapsulate(EVP_PKEY_CTX *ctx,
-                         unsigned char *wrappedkey, size_t *wrappedkeylen,
-                         unsigned char *genkey, size_t *genkeylen);
+    unsigned char *wrappedkey, size_t *wrappedkeylen,
+    unsigned char *genkey, size_t *genkeylen);
 int EVP_PKEY_decapsulate_init(EVP_PKEY_CTX *ctx, const OSSL_PARAM params[]);
 int EVP_PKEY_auth_decapsulate_init(EVP_PKEY_CTX *ctx, EVP_PKEY *authpub,
-                                   const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int EVP_PKEY_decapsulate(EVP_PKEY_CTX *ctx,
-                         unsigned char *unwrapped, size_t *unwrappedlen,
-                         const unsigned char *wrapped, size_t wrappedlen);
+    unsigned char *unwrapped, size_t *unwrappedlen,
+    const unsigned char *wrapped, size_t wrappedlen);
 typedef int EVP_PKEY_gen_cb(EVP_PKEY_CTX *ctx);
 
 int EVP_PKEY_fromdata_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_fromdata(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey, int selection,
-                      OSSL_PARAM param[]);
+    OSSL_PARAM param[]);
 const OSSL_PARAM *EVP_PKEY_fromdata_settable(EVP_PKEY_CTX *ctx, int selection);
 
 int EVP_PKEY_todata(const EVP_PKEY *pkey, int selection, OSSL_PARAM **params);
 int EVP_PKEY_export(const EVP_PKEY *pkey, int selection,
-                    OSSL_CALLBACK *export_cb, void *export_cbarg);
+    OSSL_CALLBACK *export_cb, void *export_cbarg);
 
 const OSSL_PARAM *EVP_PKEY_gettable_params(const EVP_PKEY *pkey);
 int EVP_PKEY_get_params(const EVP_PKEY *pkey, OSSL_PARAM params[]);
 int EVP_PKEY_get_int_param(const EVP_PKEY *pkey, const char *key_name,
-                           int *out);
+    int *out);
 int EVP_PKEY_get_size_t_param(const EVP_PKEY *pkey, const char *key_name,
-                              size_t *out);
+    size_t *out);
 int EVP_PKEY_get_bn_param(const EVP_PKEY *pkey, const char *key_name,
-                          BIGNUM **bn);
+    BIGNUM **bn);
 int EVP_PKEY_get_utf8_string_param(const EVP_PKEY *pkey, const char *key_name,
-                                    char *str, size_t max_buf_sz, size_t *out_sz);
+    char *str, size_t max_buf_sz, size_t *out_sz);
 int EVP_PKEY_get_octet_string_param(const EVP_PKEY *pkey, const char *key_name,
-                                    unsigned char *buf, size_t max_buf_sz,
-                                    size_t *out_sz);
+    unsigned char *buf, size_t max_buf_sz,
+    size_t *out_sz);
 
 const OSSL_PARAM *EVP_PKEY_settable_params(const EVP_PKEY *pkey);
 int EVP_PKEY_set_params(EVP_PKEY *pkey, OSSL_PARAM params[]);
 int EVP_PKEY_set_int_param(EVP_PKEY *pkey, const char *key_name, int in);
 int EVP_PKEY_set_size_t_param(EVP_PKEY *pkey, const char *key_name, size_t in);
 int EVP_PKEY_set_bn_param(EVP_PKEY *pkey, const char *key_name,
-                          const BIGNUM *bn);
+    const BIGNUM *bn);
 int EVP_PKEY_set_utf8_string_param(EVP_PKEY *pkey, const char *key_name,
-                                   const char *str);
+    const char *str);
 int EVP_PKEY_set_octet_string_param(EVP_PKEY *pkey, const char *key_name,
-                                    const unsigned char *buf, size_t bsize);
+    const unsigned char *buf, size_t bsize);
 
 int EVP_PKEY_get_ec_point_conv_form(const EVP_PKEY *pkey);
 int EVP_PKEY_get_field_type(const EVP_PKEY *pkey);
 
 EVP_PKEY *EVP_PKEY_Q_keygen(OSSL_LIB_CTX *libctx, const char *propq,
-                            const char *type, ...);
+    const char *type, ...);
 int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
 int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx);
@@ -2104,7 +2094,7 @@ int EVP_PKEY_param_check_quick(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_private_check(EVP_PKEY_CTX *ctx);
 int EVP_PKEY_pairwise_check(EVP_PKEY_CTX *ctx);
 
-# define EVP_PKEY_get_ex_new_index(l, p, newf, dupf, freef) \
+#define EVP_PKEY_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_EVP_PKEY, l, p, newf, dupf, freef)
 int EVP_PKEY_set_ex_data(EVP_PKEY *key, int idx, void *arg);
 void *EVP_PKEY_get_ex_data(const EVP_PKEY *key, int idx);
@@ -2113,163 +2103,118 @@ void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb);
 EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
 
 int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-                                             int (*init) (EVP_PKEY_CTX *ctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_copy
-    (EVP_PKEY_METHOD *pmeth, int (*copy) (EVP_PKEY_CTX *dst,
-                                          const EVP_PKEY_CTX *src));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_cleanup
-    (EVP_PKEY_METHOD *pmeth, void (*cleanup) (EVP_PKEY_CTX *ctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_paramgen
-    (EVP_PKEY_METHOD *pmeth, int (*paramgen_init) (EVP_PKEY_CTX *ctx),
-     int (*paramgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_keygen
-    (EVP_PKEY_METHOD *pmeth, int (*keygen_init) (EVP_PKEY_CTX *ctx),
-     int (*keygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_sign
-    (EVP_PKEY_METHOD *pmeth, int (*sign_init) (EVP_PKEY_CTX *ctx),
-     int (*sign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                  const unsigned char *tbs, size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_verify
-    (EVP_PKEY_METHOD *pmeth, int (*verify_init) (EVP_PKEY_CTX *ctx),
-     int (*verify) (EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
-                    const unsigned char *tbs, size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_verify_recover
-    (EVP_PKEY_METHOD *pmeth, int (*verify_recover_init) (EVP_PKEY_CTX *ctx),
-     int (*verify_recover) (EVP_PKEY_CTX *ctx, unsigned char *sig,
-                            size_t *siglen, const unsigned char *tbs,
-                            size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_signctx
-    (EVP_PKEY_METHOD *pmeth, int (*signctx_init) (EVP_PKEY_CTX *ctx,
-                                                  EVP_MD_CTX *mctx),
-     int (*signctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                     EVP_MD_CTX *mctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_verifyctx
-    (EVP_PKEY_METHOD *pmeth, int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                    EVP_MD_CTX *mctx),
-     int (*verifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
-                       EVP_MD_CTX *mctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_encrypt
-    (EVP_PKEY_METHOD *pmeth, int (*encrypt_init) (EVP_PKEY_CTX *ctx),
-     int (*encryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                       const unsigned char *in, size_t inlen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_decrypt
-    (EVP_PKEY_METHOD *pmeth, int (*decrypt_init) (EVP_PKEY_CTX *ctx),
-     int (*decrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_derive
-    (EVP_PKEY_METHOD *pmeth, int (*derive_init) (EVP_PKEY_CTX *ctx),
-     int (*derive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_ctrl
-    (EVP_PKEY_METHOD *pmeth, int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                          void *p2),
-     int (*ctrl_str) (EVP_PKEY_CTX *ctx, const char *type, const char *value));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_digestsign
-    (EVP_PKEY_METHOD *pmeth,
-     int (*digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
-                        const unsigned char *tbs, size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_digestverify
-    (EVP_PKEY_METHOD *pmeth,
-     int (*digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
-                          size_t siglen, const unsigned char *tbs,
-                          size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_check
-    (EVP_PKEY_METHOD *pmeth, int (*check) (EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_public_check
-    (EVP_PKEY_METHOD *pmeth, int (*check) (EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_param_check
-    (EVP_PKEY_METHOD *pmeth, int (*check) (EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_digest_custom
-    (EVP_PKEY_METHOD *pmeth, int (*digest_custom) (EVP_PKEY_CTX *ctx,
-                                                   EVP_MD_CTX *mctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_init
-    (const EVP_PKEY_METHOD *pmeth, int (**pinit) (EVP_PKEY_CTX *ctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_copy
-    (const EVP_PKEY_METHOD *pmeth, int (**pcopy) (EVP_PKEY_CTX *dst,
-                                                  const EVP_PKEY_CTX *src));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_cleanup
-    (const EVP_PKEY_METHOD *pmeth, void (**pcleanup) (EVP_PKEY_CTX *ctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_paramgen
-    (const EVP_PKEY_METHOD *pmeth, int (**pparamgen_init) (EVP_PKEY_CTX *ctx),
-     int (**pparamgen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_keygen
-    (const EVP_PKEY_METHOD *pmeth, int (**pkeygen_init) (EVP_PKEY_CTX *ctx),
-     int (**pkeygen) (EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_sign
-    (const EVP_PKEY_METHOD *pmeth, int (**psign_init) (EVP_PKEY_CTX *ctx),
-     int (**psign) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                    const unsigned char *tbs, size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_verify
-    (const EVP_PKEY_METHOD *pmeth, int (**pverify_init) (EVP_PKEY_CTX *ctx),
-     int (**pverify) (EVP_PKEY_CTX *ctx, const unsigned char *sig,
-                      size_t siglen, const unsigned char *tbs, size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_verify_recover
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**pverify_recover_init) (EVP_PKEY_CTX *ctx),
-     int (**pverify_recover) (EVP_PKEY_CTX *ctx, unsigned char *sig,
-                              size_t *siglen, const unsigned char *tbs,
-                              size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_signctx
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**psignctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
-     int (**psignctx) (EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
-                       EVP_MD_CTX *mctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_verifyctx
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**pverifyctx_init) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
-     int (**pverifyctx) (EVP_PKEY_CTX *ctx, const unsigned char *sig,
-                          int siglen, EVP_MD_CTX *mctx));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_encrypt
-    (const EVP_PKEY_METHOD *pmeth, int (**pencrypt_init) (EVP_PKEY_CTX *ctx),
-     int (**pencryptfn) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                         const unsigned char *in, size_t inlen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_decrypt
-    (const EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init) (EVP_PKEY_CTX *ctx),
-     int (**pdecrypt) (EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
-                       const unsigned char *in, size_t inlen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_derive
-    (const EVP_PKEY_METHOD *pmeth, int (**pderive_init) (EVP_PKEY_CTX *ctx),
-     int (**pderive) (EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_ctrl
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**pctrl) (EVP_PKEY_CTX *ctx, int type, int p1, void *p2),
-     int (**pctrl_str) (EVP_PKEY_CTX *ctx, const char *type,
-                        const char *value));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_digestsign
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**digestsign) (EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
-                         const unsigned char *tbs, size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_digestverify
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**digestverify) (EVP_MD_CTX *ctx, const unsigned char *sig,
-                           size_t siglen, const unsigned char *tbs,
-                           size_t tbslen));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_check
-    (const EVP_PKEY_METHOD *pmeth, int (**pcheck) (EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_public_check
-    (const EVP_PKEY_METHOD *pmeth, int (**pcheck) (EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_param_check
-    (const EVP_PKEY_METHOD *pmeth, int (**pcheck) (EVP_PKEY *pkey));
-OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_digest_custom
-    (const EVP_PKEY_METHOD *pmeth,
-     int (**pdigest_custom) (EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx));
-# endif
+    int (*init)(EVP_PKEY_CTX *ctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth, int (*copy)(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth, void (*cleanup)(EVP_PKEY_CTX *ctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth, int (*paramgen_init)(EVP_PKEY_CTX *ctx),
+    int (*paramgen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth, int (*keygen_init)(EVP_PKEY_CTX *ctx),
+    int (*keygen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth, int (*sign_init)(EVP_PKEY_CTX *ctx),
+    int (*sign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth, int (*verify_init)(EVP_PKEY_CTX *ctx),
+    int (*verify)(EVP_PKEY_CTX *ctx, const unsigned char *sig, size_t siglen,
+        const unsigned char *tbs, size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth, int (*verify_recover_init)(EVP_PKEY_CTX *ctx),
+    int (*verify_recover)(EVP_PKEY_CTX *ctx, unsigned char *sig,
+        size_t *siglen, const unsigned char *tbs,
+        size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth, int (*signctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+    int (*signctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+        EVP_MD_CTX *mctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth, int (*verifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+    int (*verifyctx)(EVP_PKEY_CTX *ctx, const unsigned char *sig, int siglen,
+        EVP_MD_CTX *mctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth, int (*encrypt_init)(EVP_PKEY_CTX *ctx),
+    int (*encryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+        const unsigned char *in, size_t inlen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth, int (*decrypt_init)(EVP_PKEY_CTX *ctx),
+    int (*decrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+        const unsigned char *in, size_t inlen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth, int (*derive_init)(EVP_PKEY_CTX *ctx),
+    int (*derive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth, int (*ctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2),
+    int (*ctrl_str)(EVP_PKEY_CTX *ctx, const char *type, const char *value));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_digestsign(EVP_PKEY_METHOD *pmeth,
+    int (*digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_digestverify(EVP_PKEY_METHOD *pmeth,
+    int (*digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+        size_t siglen, const unsigned char *tbs,
+        size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_check(EVP_PKEY_METHOD *pmeth, int (*check)(EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_public_check(EVP_PKEY_METHOD *pmeth, int (*check)(EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_param_check(EVP_PKEY_METHOD *pmeth, int (*check)(EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_set_digest_custom(EVP_PKEY_METHOD *pmeth, int (*digest_custom)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_init(const EVP_PKEY_METHOD *pmeth, int (**pinit)(EVP_PKEY_CTX *ctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_copy(const EVP_PKEY_METHOD *pmeth, int (**pcopy)(EVP_PKEY_CTX *dst, const EVP_PKEY_CTX *src));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_cleanup(const EVP_PKEY_METHOD *pmeth, void (**pcleanup)(EVP_PKEY_CTX *ctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_paramgen(const EVP_PKEY_METHOD *pmeth, int (**pparamgen_init)(EVP_PKEY_CTX *ctx),
+    int (**pparamgen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_keygen(const EVP_PKEY_METHOD *pmeth, int (**pkeygen_init)(EVP_PKEY_CTX *ctx),
+    int (**pkeygen)(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_sign(const EVP_PKEY_METHOD *pmeth, int (**psign_init)(EVP_PKEY_CTX *ctx),
+    int (**psign)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_verify(const EVP_PKEY_METHOD *pmeth, int (**pverify_init)(EVP_PKEY_CTX *ctx),
+    int (**pverify)(EVP_PKEY_CTX *ctx, const unsigned char *sig,
+        size_t siglen, const unsigned char *tbs, size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_verify_recover(const EVP_PKEY_METHOD *pmeth,
+    int (**pverify_recover_init)(EVP_PKEY_CTX *ctx),
+    int (**pverify_recover)(EVP_PKEY_CTX *ctx, unsigned char *sig,
+        size_t *siglen, const unsigned char *tbs,
+        size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_signctx(const EVP_PKEY_METHOD *pmeth,
+    int (**psignctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+    int (**psignctx)(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen,
+        EVP_MD_CTX *mctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_verifyctx(const EVP_PKEY_METHOD *pmeth,
+    int (**pverifyctx_init)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx),
+    int (**pverifyctx)(EVP_PKEY_CTX *ctx, const unsigned char *sig,
+        int siglen, EVP_MD_CTX *mctx));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_encrypt(const EVP_PKEY_METHOD *pmeth, int (**pencrypt_init)(EVP_PKEY_CTX *ctx),
+    int (**pencryptfn)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+        const unsigned char *in, size_t inlen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_decrypt(const EVP_PKEY_METHOD *pmeth, int (**pdecrypt_init)(EVP_PKEY_CTX *ctx),
+    int (**pdecrypt)(EVP_PKEY_CTX *ctx, unsigned char *out, size_t *outlen,
+        const unsigned char *in, size_t inlen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_derive(const EVP_PKEY_METHOD *pmeth, int (**pderive_init)(EVP_PKEY_CTX *ctx),
+    int (**pderive)(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_ctrl(const EVP_PKEY_METHOD *pmeth,
+    int (**pctrl)(EVP_PKEY_CTX *ctx, int type, int p1, void *p2),
+    int (**pctrl_str)(EVP_PKEY_CTX *ctx, const char *type,
+        const char *value));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_digestsign(const EVP_PKEY_METHOD *pmeth,
+    int (**digestsign)(EVP_MD_CTX *ctx, unsigned char *sig, size_t *siglen,
+        const unsigned char *tbs, size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_digestverify(const EVP_PKEY_METHOD *pmeth,
+    int (**digestverify)(EVP_MD_CTX *ctx, const unsigned char *sig,
+        size_t siglen, const unsigned char *tbs,
+        size_t tbslen));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_check(const EVP_PKEY_METHOD *pmeth, int (**pcheck)(EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_public_check(const EVP_PKEY_METHOD *pmeth, int (**pcheck)(EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_param_check(const EVP_PKEY_METHOD *pmeth, int (**pcheck)(EVP_PKEY *pkey));
+OSSL_DEPRECATEDIN_3_0 void EVP_PKEY_meth_get_digest_custom(const EVP_PKEY_METHOD *pmeth,
+    int (**pdigest_custom)(EVP_PKEY_CTX *ctx, EVP_MD_CTX *mctx));
+#endif
 
 void EVP_KEYEXCH_free(EVP_KEYEXCH *exchange);
 int EVP_KEYEXCH_up_ref(EVP_KEYEXCH *exchange);
 EVP_KEYEXCH *EVP_KEYEXCH_fetch(OSSL_LIB_CTX *ctx, const char *algorithm,
-                               const char *properties);
+    const char *properties);
 OSSL_PROVIDER *EVP_KEYEXCH_get0_provider(const EVP_KEYEXCH *exchange);
 int EVP_KEYEXCH_is_a(const EVP_KEYEXCH *keyexch, const char *name);
 const char *EVP_KEYEXCH_get0_name(const EVP_KEYEXCH *keyexch);
 const char *EVP_KEYEXCH_get0_description(const EVP_KEYEXCH *keyexch);
 void EVP_KEYEXCH_do_all_provided(OSSL_LIB_CTX *libctx,
-                                 void (*fn)(EVP_KEYEXCH *keyexch, void *data),
-                                 void *data);
+    void (*fn)(EVP_KEYEXCH *keyexch, void *data),
+    void *data);
 int EVP_KEYEXCH_names_do_all(const EVP_KEYEXCH *keyexch,
-                             void (*fn)(const char *name, void *data),
-                             void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 const OSSL_PARAM *EVP_KEYEXCH_gettable_ctx_params(const EVP_KEYEXCH *keyexch);
 const OSSL_PARAM *EVP_KEYEXCH_settable_ctx_params(const EVP_KEYEXCH *keyexch);
 
@@ -2278,7 +2223,7 @@ void EVP_add_alg_module(void);
 int EVP_PKEY_CTX_set_group_name(EVP_PKEY_CTX *ctx, const char *name);
 int EVP_PKEY_CTX_get_group_name(EVP_PKEY_CTX *ctx, char *name, size_t namelen);
 int EVP_PKEY_get_group_name(const EVP_PKEY *pkey, char *name, size_t name_sz,
-                            size_t *gname_len);
+    size_t *gname_len);
 
 OSSL_LIB_CTX *EVP_PKEY_CTX_get0_libctx(EVP_PKEY_CTX *ctx);
 const char *EVP_PKEY_CTX_get0_propq(const EVP_PKEY_CTX *ctx);
@@ -2286,25 +2231,25 @@ const OSSL_PROVIDER *EVP_PKEY_CTX_get0_provider(const EVP_PKEY_CTX *ctx);
 
 int EVP_SKEY_is_a(const EVP_SKEY *skey, const char *name);
 EVP_SKEY *EVP_SKEY_import(OSSL_LIB_CTX *libctx, const char *skeymgmtname, const char *propquery,
-                          int selection, const OSSL_PARAM *params);
+    int selection, const OSSL_PARAM *params);
 EVP_SKEY *EVP_SKEY_generate(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
-                            const char *propquery, const OSSL_PARAM *params);
+    const char *propquery, const OSSL_PARAM *params);
 EVP_SKEY *EVP_SKEY_import_raw_key(OSSL_LIB_CTX *libctx, const char *skeymgmtname,
-                                  unsigned char *key, size_t keylen,
-                                  const char *propquery);
+    unsigned char *key, size_t keylen,
+    const char *propquery);
 int EVP_SKEY_get0_raw_key(const EVP_SKEY *skey, const unsigned char **key,
-                          size_t *len);
+    size_t *len);
 const char *EVP_SKEY_get0_key_id(const EVP_SKEY *skey);
 int EVP_SKEY_export(const EVP_SKEY *skey, int selection,
-                    OSSL_CALLBACK *export_cb, void *export_cbarg);
+    OSSL_CALLBACK *export_cb, void *export_cbarg);
 int EVP_SKEY_up_ref(EVP_SKEY *skey);
 void EVP_SKEY_free(EVP_SKEY *skey);
 const char *EVP_SKEY_get0_skeymgmt_name(const EVP_SKEY *skey);
 const char *EVP_SKEY_get0_provider_name(const EVP_SKEY *skey);
 EVP_SKEY *EVP_SKEY_to_provider(EVP_SKEY *skey, OSSL_LIB_CTX *libctx,
-                               OSSL_PROVIDER *prov, const char *propquery);
+    OSSL_PROVIDER *prov, const char *propquery);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h
index 6dc846a28445..06dd95f4e254 100644
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@@ -9,140 +9,138 @@
  */
 
 #ifndef OPENSSL_EVPERR_H
-# define OPENSSL_EVPERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_EVPERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * EVP reason codes.
  */
-# define EVP_R_AES_KEY_SETUP_FAILED                       143
-# define EVP_R_ARIA_KEY_SETUP_FAILED                      176
-# define EVP_R_BAD_ALGORITHM_NAME                         200
-# define EVP_R_BAD_DECRYPT                                100
-# define EVP_R_BAD_KEY_LENGTH                             195
-# define EVP_R_BUFFER_TOO_SMALL                           155
-# define EVP_R_CACHE_CONSTANTS_FAILED                     225
-# define EVP_R_CAMELLIA_KEY_SETUP_FAILED                  157
-# define EVP_R_CANNOT_GET_PARAMETERS                      197
-# define EVP_R_CANNOT_SET_PARAMETERS                      198
-# define EVP_R_CIPHER_NOT_GCM_MODE                        184
-# define EVP_R_CIPHER_PARAMETER_ERROR                     122
-# define EVP_R_COMMAND_NOT_SUPPORTED                      147
-# define EVP_R_CONFLICTING_ALGORITHM_NAME                 201
-# define EVP_R_COPY_ERROR                                 173
-# define EVP_R_CTRL_NOT_IMPLEMENTED                       132
-# define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED             133
-# define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH          138
-# define EVP_R_DECODE_ERROR                               114
-# define EVP_R_DEFAULT_QUERY_PARSE_ERROR                  210
-# define EVP_R_DIFFERENT_KEY_TYPES                        101
-# define EVP_R_DIFFERENT_PARAMETERS                       153
-# define EVP_R_ERROR_LOADING_SECTION                      165
-# define EVP_R_EXPECTING_AN_HMAC_KEY                      174
-# define EVP_R_EXPECTING_AN_RSA_KEY                       127
-# define EVP_R_EXPECTING_A_DH_KEY                         128
-# define EVP_R_EXPECTING_A_DSA_KEY                        129
-# define EVP_R_EXPECTING_A_ECX_KEY                        219
-# define EVP_R_EXPECTING_A_EC_KEY                         142
-# define EVP_R_EXPECTING_A_POLY1305_KEY                   164
-# define EVP_R_EXPECTING_A_SIPHASH_KEY                    175
-# define EVP_R_FINAL_ERROR                                188
-# define EVP_R_GENERATE_ERROR                             214
-# define EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED  229
-# define EVP_R_GET_RAW_KEY_FAILED                         182
-# define EVP_R_ILLEGAL_SCRYPT_PARAMETERS                  171
-# define EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS             204
-# define EVP_R_INACCESSIBLE_KEY                           203
-# define EVP_R_INITIALIZATION_ERROR                       134
-# define EVP_R_INPUT_NOT_INITIALIZED                      111
-# define EVP_R_INVALID_CUSTOM_LENGTH                      185
-# define EVP_R_INVALID_DIGEST                             152
-# define EVP_R_INVALID_IV_LENGTH                          194
-# define EVP_R_INVALID_KEY                                163
-# define EVP_R_INVALID_KEY_LENGTH                         130
-# define EVP_R_INVALID_LENGTH                             221
-# define EVP_R_INVALID_NULL_ALGORITHM                     218
-# define EVP_R_INVALID_OPERATION                          148
-# define EVP_R_INVALID_PROVIDER_FUNCTIONS                 193
-# define EVP_R_INVALID_SALT_LENGTH                        186
-# define EVP_R_INVALID_SECRET_LENGTH                      223
-# define EVP_R_INVALID_SEED_LENGTH                        220
-# define EVP_R_INVALID_VALUE                              222
-# define EVP_R_KEYMGMT_EXPORT_FAILURE                     205
-# define EVP_R_KEY_SETUP_FAILED                           180
-# define EVP_R_LOCKING_NOT_SUPPORTED                      213
-# define EVP_R_MEMORY_LIMIT_EXCEEDED                      172
-# define EVP_R_MESSAGE_DIGEST_IS_NULL                     159
-# define EVP_R_METHOD_NOT_SUPPORTED                       144
-# define EVP_R_MISSING_PARAMETERS                         103
-# define EVP_R_NOT_ABLE_TO_COPY_CTX                       190
-# define EVP_R_NOT_XOF_OR_INVALID_LENGTH                  178
-# define EVP_R_NO_CIPHER_SET                              131
-# define EVP_R_NO_DEFAULT_DIGEST                          158
-# define EVP_R_NO_DIGEST_SET                              139
-# define EVP_R_NO_IMPORT_FUNCTION                         206
-# define EVP_R_NO_KEYMGMT_AVAILABLE                       199
-# define EVP_R_NO_KEYMGMT_PRESENT                         196
-# define EVP_R_NO_KEY_SET                                 154
-# define EVP_R_NO_OPERATION_SET                           149
-# define EVP_R_NULL_MAC_PKEY_CTX                          208
-# define EVP_R_ONLY_ONESHOT_SUPPORTED                     177
-# define EVP_R_OPERATION_NOT_INITIALIZED                  151
-# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   150
-# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE 226
-# define EVP_R_OUTPUT_WOULD_OVERFLOW                      202
-# define EVP_R_PARAMETER_TOO_LARGE                        187
-# define EVP_R_PARTIALLY_OVERLAPPING                      162
-# define EVP_R_PBKDF2_ERROR                               181
-# define EVP_R_PIPELINE_NOT_SUPPORTED                     230
-# define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179
-# define EVP_R_PRIVATE_KEY_DECODE_ERROR                   145
-# define EVP_R_PRIVATE_KEY_ENCODE_ERROR                   146
-# define EVP_R_PROVIDER_ASYM_CIPHER_FAILURE               232
-# define EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED         235
-# define EVP_R_PROVIDER_KEYMGMT_FAILURE                   233
-# define EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED             236
-# define EVP_R_PROVIDER_SIGNATURE_FAILURE                 234
-# define EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED           237
-# define EVP_R_PUBLIC_KEY_NOT_RSA                         106
-# define EVP_R_SETTING_XOF_FAILED                         227
-# define EVP_R_SET_DEFAULT_PROPERTY_FAILURE               209
-# define EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE   228
-# define EVP_R_TOO_MANY_PIPES                             231
-# define EVP_R_TOO_MANY_RECORDS                           183
-# define EVP_R_UNABLE_TO_ENABLE_LOCKING                   212
-# define EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE         215
-# define EVP_R_UNABLE_TO_GET_RANDOM_STRENGTH              216
-# define EVP_R_UNABLE_TO_LOCK_CONTEXT                     211
-# define EVP_R_UNABLE_TO_SET_CALLBACKS                    217
-# define EVP_R_UNKNOWN_BITS                               166
-# define EVP_R_UNKNOWN_CIPHER                             160
-# define EVP_R_UNKNOWN_DIGEST                             161
-# define EVP_R_UNKNOWN_KEY_TYPE                           207
-# define EVP_R_UNKNOWN_MAX_SIZE                           167
-# define EVP_R_UNKNOWN_OPTION                             169
-# define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
-# define EVP_R_UNKNOWN_SECURITY_BITS                      168
-# define EVP_R_UNSUPPORTED_ALGORITHM                      156
-# define EVP_R_UNSUPPORTED_CIPHER                         107
-# define EVP_R_UNSUPPORTED_KEYLENGTH                      123
-# define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION        124
-# define EVP_R_UNSUPPORTED_KEY_SIZE                       108
-# define EVP_R_UNSUPPORTED_KEY_TYPE                       224
-# define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS               135
-# define EVP_R_UNSUPPORTED_PRF                            125
-# define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM          118
-# define EVP_R_UNSUPPORTED_SALT_TYPE                      126
-# define EVP_R_UPDATE_ERROR                               189
-# define EVP_R_WRAP_MODE_NOT_ALLOWED                      170
-# define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   109
-# define EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE                 191
-# define EVP_R_XTS_DUPLICATED_KEYS                        192
+#define EVP_R_AES_KEY_SETUP_FAILED 143
+#define EVP_R_ARIA_KEY_SETUP_FAILED 176
+#define EVP_R_BAD_ALGORITHM_NAME 200
+#define EVP_R_BAD_DECRYPT 100
+#define EVP_R_BAD_KEY_LENGTH 195
+#define EVP_R_BUFFER_TOO_SMALL 155
+#define EVP_R_CACHE_CONSTANTS_FAILED 225
+#define EVP_R_CAMELLIA_KEY_SETUP_FAILED 157
+#define EVP_R_CANNOT_GET_PARAMETERS 197
+#define EVP_R_CANNOT_SET_PARAMETERS 198
+#define EVP_R_CIPHER_NOT_GCM_MODE 184
+#define EVP_R_CIPHER_PARAMETER_ERROR 122
+#define EVP_R_COMMAND_NOT_SUPPORTED 147
+#define EVP_R_CONFLICTING_ALGORITHM_NAME 201
+#define EVP_R_COPY_ERROR 173
+#define EVP_R_CTRL_NOT_IMPLEMENTED 132
+#define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED 133
+#define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH 138
+#define EVP_R_DECODE_ERROR 114
+#define EVP_R_DEFAULT_QUERY_PARSE_ERROR 210
+#define EVP_R_DIFFERENT_KEY_TYPES 101
+#define EVP_R_DIFFERENT_PARAMETERS 153
+#define EVP_R_ERROR_LOADING_SECTION 165
+#define EVP_R_EXPECTING_AN_HMAC_KEY 174
+#define EVP_R_EXPECTING_AN_RSA_KEY 127
+#define EVP_R_EXPECTING_A_DH_KEY 128
+#define EVP_R_EXPECTING_A_DSA_KEY 129
+#define EVP_R_EXPECTING_A_ECX_KEY 219
+#define EVP_R_EXPECTING_A_EC_KEY 142
+#define EVP_R_EXPECTING_A_POLY1305_KEY 164
+#define EVP_R_EXPECTING_A_SIPHASH_KEY 175
+#define EVP_R_FINAL_ERROR 188
+#define EVP_R_GENERATE_ERROR 214
+#define EVP_R_GETTING_ALGORITHMIDENTIFIER_NOT_SUPPORTED 229
+#define EVP_R_GET_RAW_KEY_FAILED 182
+#define EVP_R_ILLEGAL_SCRYPT_PARAMETERS 171
+#define EVP_R_INACCESSIBLE_DOMAIN_PARAMETERS 204
+#define EVP_R_INACCESSIBLE_KEY 203
+#define EVP_R_INITIALIZATION_ERROR 134
+#define EVP_R_INPUT_NOT_INITIALIZED 111
+#define EVP_R_INVALID_CUSTOM_LENGTH 185
+#define EVP_R_INVALID_DIGEST 152
+#define EVP_R_INVALID_IV_LENGTH 194
+#define EVP_R_INVALID_KEY 163
+#define EVP_R_INVALID_KEY_LENGTH 130
+#define EVP_R_INVALID_LENGTH 221
+#define EVP_R_INVALID_NULL_ALGORITHM 218
+#define EVP_R_INVALID_OPERATION 148
+#define EVP_R_INVALID_PROVIDER_FUNCTIONS 193
+#define EVP_R_INVALID_SALT_LENGTH 186
+#define EVP_R_INVALID_SECRET_LENGTH 223
+#define EVP_R_INVALID_SEED_LENGTH 220
+#define EVP_R_INVALID_VALUE 222
+#define EVP_R_KEYMGMT_EXPORT_FAILURE 205
+#define EVP_R_KEY_SETUP_FAILED 180
+#define EVP_R_LOCKING_NOT_SUPPORTED 213
+#define EVP_R_MEMORY_LIMIT_EXCEEDED 172
+#define EVP_R_MESSAGE_DIGEST_IS_NULL 159
+#define EVP_R_METHOD_NOT_SUPPORTED 144
+#define EVP_R_MISSING_PARAMETERS 103
+#define EVP_R_NOT_ABLE_TO_COPY_CTX 190
+#define EVP_R_NOT_XOF_OR_INVALID_LENGTH 178
+#define EVP_R_NO_CIPHER_SET 131
+#define EVP_R_NO_DEFAULT_DIGEST 158
+#define EVP_R_NO_DIGEST_SET 139
+#define EVP_R_NO_IMPORT_FUNCTION 206
+#define EVP_R_NO_KEYMGMT_AVAILABLE 199
+#define EVP_R_NO_KEYMGMT_PRESENT 196
+#define EVP_R_NO_KEY_SET 154
+#define EVP_R_NO_OPERATION_SET 149
+#define EVP_R_NULL_MAC_PKEY_CTX 208
+#define EVP_R_ONLY_ONESHOT_SUPPORTED 177
+#define EVP_R_OPERATION_NOT_INITIALIZED 151
+#define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
+#define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_SIGNATURE_TYPE 226
+#define EVP_R_OUTPUT_WOULD_OVERFLOW 202
+#define EVP_R_PARAMETER_TOO_LARGE 187
+#define EVP_R_PARTIALLY_OVERLAPPING 162
+#define EVP_R_PBKDF2_ERROR 181
+#define EVP_R_PIPELINE_NOT_SUPPORTED 230
+#define EVP_R_PKEY_APPLICATION_ASN1_METHOD_ALREADY_REGISTERED 179
+#define EVP_R_PRIVATE_KEY_DECODE_ERROR 145
+#define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146
+#define EVP_R_PROVIDER_ASYM_CIPHER_FAILURE 232
+#define EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED 235
+#define EVP_R_PROVIDER_KEYMGMT_FAILURE 233
+#define EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED 236
+#define EVP_R_PROVIDER_SIGNATURE_FAILURE 234
+#define EVP_R_PROVIDER_SIGNATURE_NOT_SUPPORTED 237
+#define EVP_R_PUBLIC_KEY_NOT_RSA 106
+#define EVP_R_SETTING_XOF_FAILED 227
+#define EVP_R_SET_DEFAULT_PROPERTY_FAILURE 209
+#define EVP_R_SIGNATURE_TYPE_AND_KEY_TYPE_INCOMPATIBLE 228
+#define EVP_R_TOO_MANY_PIPES 231
+#define EVP_R_TOO_MANY_RECORDS 183
+#define EVP_R_UNABLE_TO_ENABLE_LOCKING 212
+#define EVP_R_UNABLE_TO_GET_MAXIMUM_REQUEST_SIZE 215
+#define EVP_R_UNABLE_TO_GET_RANDOM_STRENGTH 216
+#define EVP_R_UNABLE_TO_LOCK_CONTEXT 211
+#define EVP_R_UNABLE_TO_SET_CALLBACKS 217
+#define EVP_R_UNKNOWN_BITS 166
+#define EVP_R_UNKNOWN_CIPHER 160
+#define EVP_R_UNKNOWN_DIGEST 161
+#define EVP_R_UNKNOWN_KEY_TYPE 207
+#define EVP_R_UNKNOWN_MAX_SIZE 167
+#define EVP_R_UNKNOWN_OPTION 169
+#define EVP_R_UNKNOWN_PBE_ALGORITHM 121
+#define EVP_R_UNKNOWN_SECURITY_BITS 168
+#define EVP_R_UNSUPPORTED_ALGORITHM 156
+#define EVP_R_UNSUPPORTED_CIPHER 107
+#define EVP_R_UNSUPPORTED_KEYLENGTH 123
+#define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION 124
+#define EVP_R_UNSUPPORTED_KEY_SIZE 108
+#define EVP_R_UNSUPPORTED_KEY_TYPE 224
+#define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
+#define EVP_R_UNSUPPORTED_PRF 125
+#define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 118
+#define EVP_R_UNSUPPORTED_SALT_TYPE 126
+#define EVP_R_UPDATE_ERROR 189
+#define EVP_R_WRAP_MODE_NOT_ALLOWED 170
+#define EVP_R_WRONG_FINAL_BLOCK_LENGTH 109
+#define EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE 191
+#define EVP_R_XTS_DUPLICATED_KEYS 192
 
 #endif
diff --git a/include/openssl/fips_names.h b/include/openssl/fips_names.h
index fa481fc61131..3e310bb4a8f2 100644
--- a/include/openssl/fips_names.h
+++ b/include/openssl/fips_names.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OPENSSL_FIPS_NAMES_H
-# define OPENSSL_FIPS_NAMES_H
-# pragma once
+#define OPENSSL_FIPS_NAMES_H
+#pragma once
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * Parameter names that the FIPS Provider defines
@@ -23,28 +23,28 @@ extern "C" {
 /* The following 4 Parameters are used for FIPS Self Testing */
 
 /* The calculated MAC of the module file */
-# define OSSL_PROV_FIPS_PARAM_MODULE_MAC      "module-mac"
+#define OSSL_PROV_FIPS_PARAM_MODULE_MAC "module-mac"
 /* The Version number for the fips install process */
-# define OSSL_PROV_FIPS_PARAM_INSTALL_VERSION "install-version"
+#define OSSL_PROV_FIPS_PARAM_INSTALL_VERSION "install-version"
 /* The calculated MAC of the install status indicator */
-# define OSSL_PROV_FIPS_PARAM_INSTALL_MAC     "install-mac"
+#define OSSL_PROV_FIPS_PARAM_INSTALL_MAC "install-mac"
 /* The install status indicator */
-# define OSSL_PROV_FIPS_PARAM_INSTALL_STATUS  "install-status"
+#define OSSL_PROV_FIPS_PARAM_INSTALL_STATUS "install-status"
 
 /*
  * A boolean that determines if the FIPS conditional test errors result in
  * the module entering an error state.
  * Type: OSSL_PARAM_UTF8_STRING
  */
-# define OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS "conditional-errors"
+#define OSSL_PROV_FIPS_PARAM_CONDITIONAL_ERRORS "conditional-errors"
 
 /* The following are provided for backwards compatibility */
-# define OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS OSSL_PROV_PARAM_SECURITY_CHECKS
-# define OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK
-# define OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST
+#define OSSL_PROV_FIPS_PARAM_SECURITY_CHECKS OSSL_PROV_PARAM_SECURITY_CHECKS
+#define OSSL_PROV_FIPS_PARAM_TLS1_PRF_EMS_CHECK OSSL_PROV_PARAM_TLS1_PRF_EMS_CHECK
+#define OSSL_PROV_FIPS_PARAM_DRBG_TRUNC_DIGEST OSSL_PROV_PARAM_DRBG_TRUNC_DIGEST
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif /* OPENSSL_FIPS_NAMES_H */
diff --git a/include/openssl/fipskey.h.in b/include/openssl/fipskey.h.in
index c53012a86211..0f951dbc4ddd 100644
--- a/include/openssl/fipskey.h.in
+++ b/include/openssl/fipskey.h.in
@@ -10,31 +10,37 @@
  */
 
 #ifndef OPENSSL_FIPSKEY_H
-# define OPENSSL_FIPSKEY_H
-# pragma once
+#define OPENSSL_FIPSKEY_H
+#pragma once
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * The FIPS validation HMAC key, usable as an array initializer.
  */
+/* clang-format off */
 #define FIPS_KEY_ELEMENTS \
     {- join(', ', map { "0x$_" } unpack("(A2)*", $config{FIPSKEY})) -}
+/* clang-format on */
 
 /*
  * The FIPS validation key, as a string.
  */
+/* clang-format off */
 #define FIPS_KEY_STRING "{- $config{FIPSKEY} -}"
+/* clang-format on */
 
 /*
  * The FIPS provider vendor name, as a string.
  */
+/* clang-format off */
 #define FIPS_VENDOR "{- $config{FIPS_VENDOR} -}"
+/* clang-format on */
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index f9e1bff3f747..cb866b22787b 100644
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -8,55 +8,55 @@
  */
 
 #ifndef OPENSSL_HMAC_H
-# define OPENSSL_HMAC_H
-# pragma once
+#define OPENSSL_HMAC_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_HMAC_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_HMAC_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/evp.h>
+#include <openssl/evp.h>
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HMAC_MAX_MD_CBLOCK      200    /* Deprecated */
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HMAC_MAX_MD_CBLOCK 200 /* Deprecated */
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 size_t HMAC_size(const HMAC_CTX *e);
 OSSL_DEPRECATEDIN_3_0 HMAC_CTX *HMAC_CTX_new(void);
 OSSL_DEPRECATEDIN_3_0 int HMAC_CTX_reset(HMAC_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 void HMAC_CTX_free(HMAC_CTX *ctx);
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur int HMAC_Init(HMAC_CTX *ctx,
-                                             const void *key, int len,
-                                             const EVP_MD *md);
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    const void *key, int len,
+    const EVP_MD *md);
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                                       const EVP_MD *md, ENGINE *impl);
+    const EVP_MD *md, ENGINE *impl);
 OSSL_DEPRECATEDIN_3_0 int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data,
-                                      size_t len);
+    size_t len);
 OSSL_DEPRECATEDIN_3_0 int HMAC_Final(HMAC_CTX *ctx, unsigned char *md,
-                                     unsigned int *len);
+    unsigned int *len);
 OSSL_DEPRECATEDIN_3_0 __owur int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
 OSSL_DEPRECATEDIN_3_0 void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
 OSSL_DEPRECATEDIN_3_0 const EVP_MD *HMAC_CTX_get_md(const HMAC_CTX *ctx);
-# endif
+#endif
 
 unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *data, size_t data_len,
-                    unsigned char *md, unsigned int *md_len);
+    const unsigned char *data, size_t data_len,
+    unsigned char *md, unsigned int *md_len);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/hpke.h b/include/openssl/hpke.h
index 482acd22c38b..12496ffe60ee 100644
--- a/include/openssl/hpke.h
+++ b/include/openssl/hpke.h
@@ -9,95 +9,95 @@
 
 /* APIs and data structures for HPKE (RFC9180)  */
 #ifndef OSSL_HPKE_H
-# define OSSL_HPKE_H
-# pragma once
+#define OSSL_HPKE_H
+#pragma once
 
-# include <openssl/types.h>
+#include <openssl/types.h>
 
 /* HPKE modes */
-# define OSSL_HPKE_MODE_BASE              0 /* Base mode  */
-# define OSSL_HPKE_MODE_PSK               1 /* Pre-shared key mode */
-# define OSSL_HPKE_MODE_AUTH              2 /* Authenticated mode */
-# define OSSL_HPKE_MODE_PSKAUTH           3 /* PSK+authenticated mode */
+#define OSSL_HPKE_MODE_BASE 0 /* Base mode  */
+#define OSSL_HPKE_MODE_PSK 1 /* Pre-shared key mode */
+#define OSSL_HPKE_MODE_AUTH 2 /* Authenticated mode */
+#define OSSL_HPKE_MODE_PSKAUTH 3 /* PSK+authenticated mode */
 
 /*
  * Max for ikm, psk, pskid, info and exporter contexts.
  * RFC9180, section 7.2.1 RECOMMENDS 64 octets but we have test vectors from
  * Appendix A.6.1 with a 66 octet IKM so we'll allow that.
  */
-# define OSSL_HPKE_MAX_PARMLEN        66
-# define OSSL_HPKE_MIN_PSKLEN         32
-# define OSSL_HPKE_MAX_INFOLEN        1024
+#define OSSL_HPKE_MAX_PARMLEN 66
+#define OSSL_HPKE_MIN_PSKLEN 32
+#define OSSL_HPKE_MAX_INFOLEN 1024
 
 /*
  * The (16bit) HPKE algorithm ID IANA codepoints
  * If/when new IANA codepoints are added there are tables in
  * crypto/hpke/hpke_util.c that must also be updated.
  */
-# define OSSL_HPKE_KEM_ID_RESERVED         0x0000 /* not used */
-# define OSSL_HPKE_KEM_ID_P256             0x0010 /* NIST P-256 */
-# define OSSL_HPKE_KEM_ID_P384             0x0011 /* NIST P-384 */
-# define OSSL_HPKE_KEM_ID_P521             0x0012 /* NIST P-521 */
-# define OSSL_HPKE_KEM_ID_X25519           0x0020 /* Curve25519 */
-# define OSSL_HPKE_KEM_ID_X448             0x0021 /* Curve448 */
+#define OSSL_HPKE_KEM_ID_RESERVED 0x0000 /* not used */
+#define OSSL_HPKE_KEM_ID_P256 0x0010 /* NIST P-256 */
+#define OSSL_HPKE_KEM_ID_P384 0x0011 /* NIST P-384 */
+#define OSSL_HPKE_KEM_ID_P521 0x0012 /* NIST P-521 */
+#define OSSL_HPKE_KEM_ID_X25519 0x0020 /* Curve25519 */
+#define OSSL_HPKE_KEM_ID_X448 0x0021 /* Curve448 */
 
-# define OSSL_HPKE_KDF_ID_RESERVED         0x0000 /* not used */
-# define OSSL_HPKE_KDF_ID_HKDF_SHA256      0x0001 /* HKDF-SHA256 */
-# define OSSL_HPKE_KDF_ID_HKDF_SHA384      0x0002 /* HKDF-SHA384 */
-# define OSSL_HPKE_KDF_ID_HKDF_SHA512      0x0003 /* HKDF-SHA512 */
+#define OSSL_HPKE_KDF_ID_RESERVED 0x0000 /* not used */
+#define OSSL_HPKE_KDF_ID_HKDF_SHA256 0x0001 /* HKDF-SHA256 */
+#define OSSL_HPKE_KDF_ID_HKDF_SHA384 0x0002 /* HKDF-SHA384 */
+#define OSSL_HPKE_KDF_ID_HKDF_SHA512 0x0003 /* HKDF-SHA512 */
 
-# define OSSL_HPKE_AEAD_ID_RESERVED        0x0000 /* not used */
-# define OSSL_HPKE_AEAD_ID_AES_GCM_128     0x0001 /* AES-GCM-128 */
-# define OSSL_HPKE_AEAD_ID_AES_GCM_256     0x0002 /* AES-GCM-256 */
-# define OSSL_HPKE_AEAD_ID_CHACHA_POLY1305 0x0003 /* Chacha20-Poly1305 */
-# define OSSL_HPKE_AEAD_ID_EXPORTONLY      0xFFFF /* export-only fake ID */
+#define OSSL_HPKE_AEAD_ID_RESERVED 0x0000 /* not used */
+#define OSSL_HPKE_AEAD_ID_AES_GCM_128 0x0001 /* AES-GCM-128 */
+#define OSSL_HPKE_AEAD_ID_AES_GCM_256 0x0002 /* AES-GCM-256 */
+#define OSSL_HPKE_AEAD_ID_CHACHA_POLY1305 0x0003 /* Chacha20-Poly1305 */
+#define OSSL_HPKE_AEAD_ID_EXPORTONLY 0xFFFF /* export-only fake ID */
 
 /* strings for suite components */
-# define OSSL_HPKE_KEMSTR_P256        "P-256"              /* KEM id 0x10 */
-# define OSSL_HPKE_KEMSTR_P384        "P-384"              /* KEM id 0x11 */
-# define OSSL_HPKE_KEMSTR_P521        "P-521"              /* KEM id 0x12 */
-# define OSSL_HPKE_KEMSTR_X25519      "X25519"             /* KEM id 0x20 */
-# define OSSL_HPKE_KEMSTR_X448        "X448"               /* KEM id 0x21 */
-# define OSSL_HPKE_KDFSTR_256         "hkdf-sha256"        /* KDF id 1 */
-# define OSSL_HPKE_KDFSTR_384         "hkdf-sha384"        /* KDF id 2 */
-# define OSSL_HPKE_KDFSTR_512         "hkdf-sha512"        /* KDF id 3 */
-# define OSSL_HPKE_AEADSTR_AES128GCM  "aes-128-gcm"        /* AEAD id 1 */
-# define OSSL_HPKE_AEADSTR_AES256GCM  "aes-256-gcm"        /* AEAD id 2 */
-# define OSSL_HPKE_AEADSTR_CP         "chacha20-poly1305"  /* AEAD id 3 */
-# define OSSL_HPKE_AEADSTR_EXP        "exporter"           /* AEAD id 0xff */
+#define OSSL_HPKE_KEMSTR_P256 "P-256" /* KEM id 0x10 */
+#define OSSL_HPKE_KEMSTR_P384 "P-384" /* KEM id 0x11 */
+#define OSSL_HPKE_KEMSTR_P521 "P-521" /* KEM id 0x12 */
+#define OSSL_HPKE_KEMSTR_X25519 "X25519" /* KEM id 0x20 */
+#define OSSL_HPKE_KEMSTR_X448 "X448" /* KEM id 0x21 */
+#define OSSL_HPKE_KDFSTR_256 "hkdf-sha256" /* KDF id 1 */
+#define OSSL_HPKE_KDFSTR_384 "hkdf-sha384" /* KDF id 2 */
+#define OSSL_HPKE_KDFSTR_512 "hkdf-sha512" /* KDF id 3 */
+#define OSSL_HPKE_AEADSTR_AES128GCM "aes-128-gcm" /* AEAD id 1 */
+#define OSSL_HPKE_AEADSTR_AES256GCM "aes-256-gcm" /* AEAD id 2 */
+#define OSSL_HPKE_AEADSTR_CP "chacha20-poly1305" /* AEAD id 3 */
+#define OSSL_HPKE_AEADSTR_EXP "exporter" /* AEAD id 0xff */
 
 /*
  * Roles for use in creating an OSSL_HPKE_CTX, most
  * important use of this is to control nonce reuse.
  */
-# define OSSL_HPKE_ROLE_SENDER 0
-# define OSSL_HPKE_ROLE_RECEIVER 1
+#define OSSL_HPKE_ROLE_SENDER 0
+#define OSSL_HPKE_ROLE_RECEIVER 1
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 typedef struct {
-    uint16_t    kem_id; /* Key Encapsulation Method id */
-    uint16_t    kdf_id; /* Key Derivation Function id */
-    uint16_t    aead_id; /* AEAD alg id */
+    uint16_t kem_id; /* Key Encapsulation Method id */
+    uint16_t kdf_id; /* Key Derivation Function id */
+    uint16_t aead_id; /* AEAD alg id */
 } OSSL_HPKE_SUITE;
 
 /**
  * Suite constants, use this like:
  *          OSSL_HPKE_SUITE myvar = OSSL_HPKE_SUITE_DEFAULT;
  */
-# ifndef OPENSSL_NO_ECX
-#  define OSSL_HPKE_SUITE_DEFAULT \
-    {\
-        OSSL_HPKE_KEM_ID_X25519, \
+#ifndef OPENSSL_NO_ECX
+#define OSSL_HPKE_SUITE_DEFAULT       \
+    {                                 \
+        OSSL_HPKE_KEM_ID_X25519,      \
         OSSL_HPKE_KDF_ID_HKDF_SHA256, \
         OSSL_HPKE_AEAD_ID_AES_GCM_128 \
     }
-# else
-#  define OSSL_HPKE_SUITE_DEFAULT \
-    {\
-        OSSL_HPKE_KEM_ID_P256, \
+#else
+#define OSSL_HPKE_SUITE_DEFAULT       \
+    {                                 \
+        OSSL_HPKE_KEM_ID_P256,        \
         OSSL_HPKE_KDF_ID_HKDF_SHA256, \
         OSSL_HPKE_AEAD_ID_AES_GCM_128 \
     }
@@ -106,64 +106,64 @@ typedef struct {
 typedef struct ossl_hpke_ctx_st OSSL_HPKE_CTX;
 
 OSSL_HPKE_CTX *OSSL_HPKE_CTX_new(int mode, OSSL_HPKE_SUITE suite, int role,
-                                 OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 void OSSL_HPKE_CTX_free(OSSL_HPKE_CTX *ctx);
 
 int OSSL_HPKE_encap(OSSL_HPKE_CTX *ctx,
-                    unsigned char *enc, size_t *enclen,
-                    const unsigned char *pub, size_t publen,
-                    const unsigned char *info, size_t infolen);
+    unsigned char *enc, size_t *enclen,
+    const unsigned char *pub, size_t publen,
+    const unsigned char *info, size_t infolen);
 int OSSL_HPKE_seal(OSSL_HPKE_CTX *ctx,
-                   unsigned char *ct, size_t *ctlen,
-                   const unsigned char *aad, size_t aadlen,
-                   const unsigned char *pt, size_t ptlen);
+    unsigned char *ct, size_t *ctlen,
+    const unsigned char *aad, size_t aadlen,
+    const unsigned char *pt, size_t ptlen);
 
 int OSSL_HPKE_keygen(OSSL_HPKE_SUITE suite,
-                     unsigned char *pub, size_t *publen, EVP_PKEY **priv,
-                     const unsigned char *ikm, size_t ikmlen,
-                     OSSL_LIB_CTX *libctx, const char *propq);
+    unsigned char *pub, size_t *publen, EVP_PKEY **priv,
+    const unsigned char *ikm, size_t ikmlen,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OSSL_HPKE_decap(OSSL_HPKE_CTX *ctx,
-                    const unsigned char *enc, size_t enclen,
-                    EVP_PKEY *recippriv,
-                    const unsigned char *info, size_t infolen);
+    const unsigned char *enc, size_t enclen,
+    EVP_PKEY *recippriv,
+    const unsigned char *info, size_t infolen);
 int OSSL_HPKE_open(OSSL_HPKE_CTX *ctx,
-                   unsigned char *pt, size_t *ptlen,
-                   const unsigned char *aad, size_t aadlen,
-                   const unsigned char *ct, size_t ctlen);
+    unsigned char *pt, size_t *ptlen,
+    const unsigned char *aad, size_t aadlen,
+    const unsigned char *ct, size_t ctlen);
 
 int OSSL_HPKE_export(OSSL_HPKE_CTX *ctx,
-                     unsigned char *secret,
-                     size_t secretlen,
-                     const unsigned char *label,
-                     size_t labellen);
+    unsigned char *secret,
+    size_t secretlen,
+    const unsigned char *label,
+    size_t labellen);
 
 int OSSL_HPKE_CTX_set1_authpriv(OSSL_HPKE_CTX *ctx, EVP_PKEY *priv);
 int OSSL_HPKE_CTX_set1_authpub(OSSL_HPKE_CTX *ctx,
-                               const unsigned char *pub,
-                               size_t publen);
+    const unsigned char *pub,
+    size_t publen);
 int OSSL_HPKE_CTX_set1_psk(OSSL_HPKE_CTX *ctx,
-                           const char *pskid,
-                           const unsigned char *psk, size_t psklen);
+    const char *pskid,
+    const unsigned char *psk, size_t psklen);
 
 int OSSL_HPKE_CTX_set1_ikme(OSSL_HPKE_CTX *ctx,
-                            const unsigned char *ikme, size_t ikmelen);
+    const unsigned char *ikme, size_t ikmelen);
 
 int OSSL_HPKE_CTX_set_seq(OSSL_HPKE_CTX *ctx, uint64_t seq);
 int OSSL_HPKE_CTX_get_seq(OSSL_HPKE_CTX *ctx, uint64_t *seq);
 
 int OSSL_HPKE_suite_check(OSSL_HPKE_SUITE suite);
 int OSSL_HPKE_get_grease_value(const OSSL_HPKE_SUITE *suite_in,
-                               OSSL_HPKE_SUITE *suite,
-                               unsigned char *enc, size_t *enclen,
-                               unsigned char *ct, size_t ctlen,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_HPKE_SUITE *suite,
+    unsigned char *enc, size_t *enclen,
+    unsigned char *ct, size_t ctlen,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OSSL_HPKE_str2suite(const char *str, OSSL_HPKE_SUITE *suite);
 size_t OSSL_HPKE_get_ciphertext_size(OSSL_HPKE_SUITE suite, size_t clearlen);
 size_t OSSL_HPKE_get_public_encap_size(OSSL_HPKE_SUITE suite);
 size_t OSSL_HPKE_get_recommended_ikmelen(OSSL_HPKE_SUITE suite);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/http.h b/include/openssl/http.h
index d7aa57072505..91aa923282a2 100644
--- a/include/openssl/http.h
+++ b/include/openssl/http.h
@@ -9,111 +9,109 @@
  */
 
 #ifndef OPENSSL_HTTP_H
-# define OPENSSL_HTTP_H
-# pragma once
+#define OPENSSL_HTTP_H
+#pragma once
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/conf.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/conf.h>
 
-
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# define OSSL_HTTP_NAME "http"
-# define OSSL_HTTPS_NAME "https"
-# define OSSL_HTTP_PREFIX OSSL_HTTP_NAME"://"
-# define OSSL_HTTPS_PREFIX OSSL_HTTPS_NAME"://"
-# define OSSL_HTTP_PORT "80"
-# define OSSL_HTTPS_PORT "443"
-# define OPENSSL_NO_PROXY "NO_PROXY"
-# define OPENSSL_HTTP_PROXY "HTTP_PROXY"
-# define OPENSSL_HTTPS_PROXY "HTTPS_PROXY"
+#define OSSL_HTTP_NAME "http"
+#define OSSL_HTTPS_NAME "https"
+#define OSSL_HTTP_PREFIX OSSL_HTTP_NAME "://"
+#define OSSL_HTTPS_PREFIX OSSL_HTTPS_NAME "://"
+#define OSSL_HTTP_PORT "80"
+#define OSSL_HTTPS_PORT "443"
+#define OPENSSL_NO_PROXY "NO_PROXY"
+#define OPENSSL_HTTP_PROXY "HTTP_PROXY"
+#define OPENSSL_HTTPS_PROXY "HTTPS_PROXY"
 
 /* We want to have this even in case of OPENSSL_NO_HTTP */
 int OSSL_parse_url(const char *url, char **pscheme, char **puser, char **phost,
-                   char **pport, int *pport_num,
-                   char **ppath, char **pquery, char **pfrag);
-
-# ifndef OPENSSL_NO_HTTP
+    char **pport, int *pport_num,
+    char **ppath, char **pquery, char **pfrag);
 
-#  define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
-#  define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
-#  define OSSL_HTTP_DEFAULT_MAX_CRL_LEN (32 * 1024 * 1024)
-#  define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
+#ifndef OPENSSL_NO_HTTP
 
+#define OSSL_HTTP_DEFAULT_MAX_LINE_LEN (4 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_LEN (100 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_CRL_LEN (32 * 1024 * 1024)
+#define OSSL_HTTP_DEFAULT_MAX_RESP_HDR_LINES 256
 
 /* Low-level HTTP API */
 OSSL_HTTP_REQ_CTX *OSSL_HTTP_REQ_CTX_new(BIO *wbio, BIO *rbio, int buf_size);
 void OSSL_HTTP_REQ_CTX_free(OSSL_HTTP_REQ_CTX *rctx);
 int OSSL_HTTP_REQ_CTX_set_request_line(OSSL_HTTP_REQ_CTX *rctx, int method_POST,
-                                       const char *server, const char *port,
-                                       const char *path);
+    const char *server, const char *port,
+    const char *path);
 int OSSL_HTTP_REQ_CTX_add1_header(OSSL_HTTP_REQ_CTX *rctx,
-                                  const char *name, const char *value);
+    const char *name, const char *value);
 int OSSL_HTTP_REQ_CTX_set_expected(OSSL_HTTP_REQ_CTX *rctx,
-                                   const char *content_type, int asn1,
-                                   int timeout, int keep_alive);
+    const char *content_type, int asn1,
+    int timeout, int keep_alive);
 int OSSL_HTTP_REQ_CTX_set1_req(OSSL_HTTP_REQ_CTX *rctx, const char *content_type,
-                               const ASN1_ITEM *it, const ASN1_VALUE *req);
+    const ASN1_ITEM *it, const ASN1_VALUE *req);
 int OSSL_HTTP_REQ_CTX_nbio(OSSL_HTTP_REQ_CTX *rctx);
 int OSSL_HTTP_REQ_CTX_nbio_d2i(OSSL_HTTP_REQ_CTX *rctx,
-                               ASN1_VALUE **pval, const ASN1_ITEM *it);
+    ASN1_VALUE **pval, const ASN1_ITEM *it);
 BIO *OSSL_HTTP_REQ_CTX_exchange(OSSL_HTTP_REQ_CTX *rctx);
 BIO *OSSL_HTTP_REQ_CTX_get0_mem_bio(const OSSL_HTTP_REQ_CTX *rctx);
 size_t OSSL_HTTP_REQ_CTX_get_resp_len(const OSSL_HTTP_REQ_CTX *rctx);
 void OSSL_HTTP_REQ_CTX_set_max_response_length(OSSL_HTTP_REQ_CTX *rctx,
-                                               unsigned long len);
+    unsigned long len);
 void OSSL_HTTP_REQ_CTX_set_max_response_hdr_lines(OSSL_HTTP_REQ_CTX *rctx,
-                                                  size_t count);
+    size_t count);
 int OSSL_HTTP_is_alive(const OSSL_HTTP_REQ_CTX *rctx);
 
 /* High-level HTTP API */
 typedef BIO *(*OSSL_HTTP_bio_cb_t)(BIO *bio, void *arg, int connect, int detail);
 OSSL_HTTP_REQ_CTX *OSSL_HTTP_open(const char *server, const char *port,
-                                  const char *proxy, const char *no_proxy,
-                                  int use_ssl, BIO *bio, BIO *rbio,
-                                  OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
-                                  int buf_size, int overall_timeout);
+    const char *proxy, const char *no_proxy,
+    int use_ssl, BIO *bio, BIO *rbio,
+    OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
+    int buf_size, int overall_timeout);
 int OSSL_HTTP_proxy_connect(BIO *bio, const char *server, const char *port,
-                            const char *proxyuser, const char *proxypass,
-                            int timeout, BIO *bio_err, const char *prog);
+    const char *proxyuser, const char *proxypass,
+    int timeout, BIO *bio_err, const char *prog);
 int OSSL_HTTP_set1_request(OSSL_HTTP_REQ_CTX *rctx, const char *path,
-                           const STACK_OF(CONF_VALUE) *headers,
-                           const char *content_type, BIO *req,
-                           const char *expected_content_type, int expect_asn1,
-                           size_t max_resp_len, int timeout, int keep_alive);
+    const STACK_OF(CONF_VALUE) *headers,
+    const char *content_type, BIO *req,
+    const char *expected_content_type, int expect_asn1,
+    size_t max_resp_len, int timeout, int keep_alive);
 BIO *OSSL_HTTP_exchange(OSSL_HTTP_REQ_CTX *rctx, char **redirection_url);
 BIO *OSSL_HTTP_get(const char *url, const char *proxy, const char *no_proxy,
-                   BIO *bio, BIO *rbio,
-                   OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
-                   int buf_size, const STACK_OF(CONF_VALUE) *headers,
-                   const char *expected_content_type, int expect_asn1,
-                   size_t max_resp_len, int timeout);
+    BIO *bio, BIO *rbio,
+    OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
+    int buf_size, const STACK_OF(CONF_VALUE) *headers,
+    const char *expected_content_type, int expect_asn1,
+    size_t max_resp_len, int timeout);
 BIO *OSSL_HTTP_transfer(OSSL_HTTP_REQ_CTX **prctx,
-                        const char *server, const char *port,
-                        const char *path, int use_ssl,
-                        const char *proxy, const char *no_proxy,
-                        BIO *bio, BIO *rbio,
-                        OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
-                        int buf_size, const STACK_OF(CONF_VALUE) *headers,
-                        const char *content_type, BIO *req,
-                        const char *expected_content_type, int expect_asn1,
-                        size_t max_resp_len, int timeout, int keep_alive);
+    const char *server, const char *port,
+    const char *path, int use_ssl,
+    const char *proxy, const char *no_proxy,
+    BIO *bio, BIO *rbio,
+    OSSL_HTTP_bio_cb_t bio_update_fn, void *arg,
+    int buf_size, const STACK_OF(CONF_VALUE) *headers,
+    const char *content_type, BIO *req,
+    const char *expected_content_type, int expect_asn1,
+    size_t max_resp_len, int timeout, int keep_alive);
 int OSSL_HTTP_close(OSSL_HTTP_REQ_CTX *rctx, int ok);
 
 /* Auxiliary functions */
 int OSSL_HTTP_parse_url(const char *url, int *pssl, char **puser, char **phost,
-                        char **pport, int *pport_num,
-                        char **ppath, char **pquery, char **pfrag);
+    char **pport, int *pport_num,
+    char **ppath, char **pquery, char **pfrag);
 const char *OSSL_HTTP_adapt_proxy(const char *proxy, const char *no_proxy,
-                                  const char *server, int use_ssl);
+    const char *server, int use_ssl);
 
-# endif /* !defined(OPENSSL_NO_HTTP) */
-# ifdef  __cplusplus
+#endif /* !defined(OPENSSL_NO_HTTP) */
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif /* !defined(OPENSSL_HTTP_H) */
diff --git a/include/openssl/httperr.h b/include/openssl/httperr.h
index ae7f00cac0a1..adac95018691 100644
--- a/include/openssl/httperr.h
+++ b/include/openssl/httperr.h
@@ -9,48 +9,46 @@
  */
 
 #ifndef OPENSSL_HTTPERR_H
-# define OPENSSL_HTTPERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_HTTPERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * HTTP reason codes.
  */
-# define HTTP_R_ASN1_LEN_EXCEEDS_MAX_RESP_LEN             108
-# define HTTP_R_CONNECT_FAILURE                           100
-# define HTTP_R_ERROR_PARSING_ASN1_LENGTH                 109
-# define HTTP_R_ERROR_PARSING_CONTENT_LENGTH              119
-# define HTTP_R_ERROR_PARSING_URL                         101
-# define HTTP_R_ERROR_RECEIVING                           103
-# define HTTP_R_ERROR_SENDING                             102
-# define HTTP_R_FAILED_READING_DATA                       128
-# define HTTP_R_HEADER_PARSE_ERROR                        126
-# define HTTP_R_INCONSISTENT_CONTENT_LENGTH               120
-# define HTTP_R_INVALID_PORT_NUMBER                       123
-# define HTTP_R_INVALID_URL_PATH                          125
-# define HTTP_R_INVALID_URL_SCHEME                        124
-# define HTTP_R_MAX_RESP_LEN_EXCEEDED                     117
-# define HTTP_R_MISSING_ASN1_ENCODING                     110
-# define HTTP_R_MISSING_CONTENT_TYPE                      121
-# define HTTP_R_MISSING_REDIRECT_LOCATION                 111
-# define HTTP_R_RECEIVED_ERROR                            105
-# define HTTP_R_RECEIVED_WRONG_HTTP_VERSION               106
-# define HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP            112
-# define HTTP_R_REDIRECTION_NOT_ENABLED                   116
-# define HTTP_R_RESPONSE_LINE_TOO_LONG                    113
-# define HTTP_R_RESPONSE_PARSE_ERROR                      104
-# define HTTP_R_RESPONSE_TOO_MANY_HDRLINES                130
-# define HTTP_R_RETRY_TIMEOUT                             129
-# define HTTP_R_SERVER_CANCELED_CONNECTION                127
-# define HTTP_R_SOCK_NOT_SUPPORTED                        122
-# define HTTP_R_STATUS_CODE_UNSUPPORTED                   114
-# define HTTP_R_TLS_NOT_ENABLED                           107
-# define HTTP_R_TOO_MANY_REDIRECTIONS                     115
-# define HTTP_R_UNEXPECTED_CONTENT_TYPE                   118
+#define HTTP_R_ASN1_LEN_EXCEEDS_MAX_RESP_LEN 108
+#define HTTP_R_CONNECT_FAILURE 100
+#define HTTP_R_ERROR_PARSING_ASN1_LENGTH 109
+#define HTTP_R_ERROR_PARSING_CONTENT_LENGTH 119
+#define HTTP_R_ERROR_PARSING_URL 101
+#define HTTP_R_ERROR_RECEIVING 103
+#define HTTP_R_ERROR_SENDING 102
+#define HTTP_R_FAILED_READING_DATA 128
+#define HTTP_R_HEADER_PARSE_ERROR 126
+#define HTTP_R_INCONSISTENT_CONTENT_LENGTH 120
+#define HTTP_R_INVALID_PORT_NUMBER 123
+#define HTTP_R_INVALID_URL_PATH 125
+#define HTTP_R_INVALID_URL_SCHEME 124
+#define HTTP_R_MAX_RESP_LEN_EXCEEDED 117
+#define HTTP_R_MISSING_ASN1_ENCODING 110
+#define HTTP_R_MISSING_CONTENT_TYPE 121
+#define HTTP_R_MISSING_REDIRECT_LOCATION 111
+#define HTTP_R_RECEIVED_ERROR 105
+#define HTTP_R_RECEIVED_WRONG_HTTP_VERSION 106
+#define HTTP_R_REDIRECTION_FROM_HTTPS_TO_HTTP 112
+#define HTTP_R_REDIRECTION_NOT_ENABLED 116
+#define HTTP_R_RESPONSE_LINE_TOO_LONG 113
+#define HTTP_R_RESPONSE_PARSE_ERROR 104
+#define HTTP_R_RESPONSE_TOO_MANY_HDRLINES 130
+#define HTTP_R_RETRY_TIMEOUT 129
+#define HTTP_R_SERVER_CANCELED_CONNECTION 127
+#define HTTP_R_SOCK_NOT_SUPPORTED 122
+#define HTTP_R_STATUS_CODE_UNSUPPORTED 114
+#define HTTP_R_TLS_NOT_ENABLED 107
+#define HTTP_R_TOO_MANY_REDIRECTIONS 115
+#define HTTP_R_UNEXPECTED_CONTENT_TYPE 118
 
 #endif
diff --git a/include/openssl/idea.h b/include/openssl/idea.h
index 1f9bb3b3c71f..674a941b1a3a 100644
--- a/include/openssl/idea.h
+++ b/include/openssl/idea.h
@@ -8,30 +8,30 @@
  */
 
 #ifndef OPENSSL_IDEA_H
-# define OPENSSL_IDEA_H
-# pragma once
+#define OPENSSL_IDEA_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_IDEA_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_IDEA_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_IDEA
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_IDEA
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define IDEA_BLOCK      8
-#  define IDEA_KEY_LENGTH 16
+#define IDEA_BLOCK 8
+#define IDEA_KEY_LENGTH 16
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
 typedef unsigned int IDEA_INT;
 
-#   define IDEA_ENCRYPT    1
-#   define IDEA_DECRYPT    0
+#define IDEA_ENCRYPT 1
+#define IDEA_DECRYPT 0
 
 typedef struct idea_key_st {
     IDEA_INT data[9][6];
@@ -40,43 +40,43 @@ typedef struct idea_key_st {
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *IDEA_options(void);
 OSSL_DEPRECATEDIN_3_0 void IDEA_ecb_encrypt(const unsigned char *in,
-                                            unsigned char *out,
-                                            IDEA_KEY_SCHEDULE *ks);
+    unsigned char *out,
+    IDEA_KEY_SCHEDULE *ks);
 OSSL_DEPRECATEDIN_3_0 void IDEA_set_encrypt_key(const unsigned char *key,
-                                                IDEA_KEY_SCHEDULE *ks);
+    IDEA_KEY_SCHEDULE *ks);
 OSSL_DEPRECATEDIN_3_0 void IDEA_set_decrypt_key(IDEA_KEY_SCHEDULE *ek,
-                                                IDEA_KEY_SCHEDULE *dk);
+    IDEA_KEY_SCHEDULE *dk);
 OSSL_DEPRECATEDIN_3_0 void IDEA_cbc_encrypt(const unsigned char *in,
-                                            unsigned char *out, long length,
-                                            IDEA_KEY_SCHEDULE *ks,
-                                            unsigned char *iv, int enc);
+    unsigned char *out, long length,
+    IDEA_KEY_SCHEDULE *ks,
+    unsigned char *iv, int enc);
 OSSL_DEPRECATEDIN_3_0 void IDEA_cfb64_encrypt(const unsigned char *in,
-                                              unsigned char *out, long length,
-                                              IDEA_KEY_SCHEDULE *ks,
-                                              unsigned char *iv, int *num,
-                                              int enc);
+    unsigned char *out, long length,
+    IDEA_KEY_SCHEDULE *ks,
+    unsigned char *iv, int *num,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void IDEA_ofb64_encrypt(const unsigned char *in,
-                                              unsigned char *out, long length,
-                                              IDEA_KEY_SCHEDULE *ks,
-                                              unsigned char *iv, int *num);
+    unsigned char *out, long length,
+    IDEA_KEY_SCHEDULE *ks,
+    unsigned char *iv, int *num);
 OSSL_DEPRECATEDIN_3_0 void IDEA_encrypt(unsigned long *in,
-                                        IDEA_KEY_SCHEDULE *ks);
+    IDEA_KEY_SCHEDULE *ks);
 #endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   define idea_options          IDEA_options
-#   define idea_ecb_encrypt      IDEA_ecb_encrypt
-#   define idea_set_encrypt_key  IDEA_set_encrypt_key
-#   define idea_set_decrypt_key  IDEA_set_decrypt_key
-#   define idea_cbc_encrypt      IDEA_cbc_encrypt
-#   define idea_cfb64_encrypt    IDEA_cfb64_encrypt
-#   define idea_ofb64_encrypt    IDEA_ofb64_encrypt
-#   define idea_encrypt          IDEA_encrypt
-#  endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define idea_options IDEA_options
+#define idea_ecb_encrypt IDEA_ecb_encrypt
+#define idea_set_encrypt_key IDEA_set_encrypt_key
+#define idea_set_decrypt_key IDEA_set_decrypt_key
+#define idea_cbc_encrypt IDEA_cbc_encrypt
+#define idea_cfb64_encrypt IDEA_cfb64_encrypt
+#define idea_ofb64_encrypt IDEA_ofb64_encrypt
+#define idea_encrypt IDEA_encrypt
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/indicator.h b/include/openssl/indicator.h
index 3ea012218864..66d6f4234a65 100644
--- a/include/openssl/indicator.h
+++ b/include/openssl/indicator.h
@@ -8,24 +8,24 @@
  */
 
 #ifndef OPENSSL_INDICATOR_H
-# define OPENSSL_INDICATOR_H
-# pragma once
+#define OPENSSL_INDICATOR_H
+#pragma once
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 #include <openssl/params.h>
 
-typedef int (OSSL_INDICATOR_CALLBACK)(const char *type, const char *desc,
-                                      const OSSL_PARAM params[]);
+typedef int(OSSL_INDICATOR_CALLBACK)(const char *type, const char *desc,
+    const OSSL_PARAM params[]);
 
 void OSSL_INDICATOR_set_callback(OSSL_LIB_CTX *libctx,
-                                 OSSL_INDICATOR_CALLBACK *cb);
+    OSSL_INDICATOR_CALLBACK *cb);
 void OSSL_INDICATOR_get_callback(OSSL_LIB_CTX *libctx,
-                                 OSSL_INDICATOR_CALLBACK **cb);
+    OSSL_INDICATOR_CALLBACK **cb);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif /* OPENSSL_INDICATOR_H */
diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h
index 0983230a488a..d06ca6c69de9 100644
--- a/include/openssl/kdf.h
+++ b/include/openssl/kdf.h
@@ -8,27 +8,27 @@
  */
 
 #ifndef OPENSSL_KDF_H
-# define OPENSSL_KDF_H
-# pragma once
+#define OPENSSL_KDF_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_KDF_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_KDF_H
+#endif
 
-# include <stdarg.h>
-# include <stddef.h>
-# include <openssl/types.h>
-# include <openssl/core.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include <openssl/types.h>
+#include <openssl/core.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 int EVP_KDF_up_ref(EVP_KDF *kdf);
 void EVP_KDF_free(EVP_KDF *kdf);
 EVP_KDF *EVP_KDF_fetch(OSSL_LIB_CTX *libctx, const char *algorithm,
-                       const char *properties);
+    const char *properties);
 
 EVP_KDF_CTX *EVP_KDF_CTX_new(EVP_KDF *kdf);
 void EVP_KDF_CTX_free(EVP_KDF_CTX *ctx);
@@ -42,7 +42,7 @@ const EVP_KDF *EVP_KDF_CTX_kdf(EVP_KDF_CTX *ctx);
 void EVP_KDF_CTX_reset(EVP_KDF_CTX *ctx);
 size_t EVP_KDF_CTX_get_kdf_size(EVP_KDF_CTX *ctx);
 int EVP_KDF_derive(EVP_KDF_CTX *ctx, unsigned char *key, size_t keylen,
-                   const OSSL_PARAM params[]);
+    const OSSL_PARAM params[]);
 int EVP_KDF_get_params(EVP_KDF *kdf, OSSL_PARAM params[]);
 int EVP_KDF_CTX_get_params(EVP_KDF_CTX *ctx, OSSL_PARAM params[]);
 int EVP_KDF_CTX_set_params(EVP_KDF_CTX *ctx, const OSSL_PARAM params[]);
@@ -53,74 +53,74 @@ const OSSL_PARAM *EVP_KDF_CTX_gettable_params(EVP_KDF_CTX *ctx);
 const OSSL_PARAM *EVP_KDF_CTX_settable_params(EVP_KDF_CTX *ctx);
 
 void EVP_KDF_do_all_provided(OSSL_LIB_CTX *libctx,
-                             void (*fn)(EVP_KDF *kdf, void *arg),
-                             void *arg);
+    void (*fn)(EVP_KDF *kdf, void *arg),
+    void *arg);
 int EVP_KDF_names_do_all(const EVP_KDF *kdf,
-                         void (*fn)(const char *name, void *data),
-                         void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 
-# define EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND  0
-# define EVP_KDF_HKDF_MODE_EXTRACT_ONLY        1
-# define EVP_KDF_HKDF_MODE_EXPAND_ONLY         2
+#define EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND 0
+#define EVP_KDF_HKDF_MODE_EXTRACT_ONLY 1
+#define EVP_KDF_HKDF_MODE_EXPAND_ONLY 2
 
-#define EVP_KDF_SSHKDF_TYPE_INITIAL_IV_CLI_TO_SRV     65
-#define EVP_KDF_SSHKDF_TYPE_INITIAL_IV_SRV_TO_CLI     66
+#define EVP_KDF_SSHKDF_TYPE_INITIAL_IV_CLI_TO_SRV 65
+#define EVP_KDF_SSHKDF_TYPE_INITIAL_IV_SRV_TO_CLI 66
 #define EVP_KDF_SSHKDF_TYPE_ENCRYPTION_KEY_CLI_TO_SRV 67
 #define EVP_KDF_SSHKDF_TYPE_ENCRYPTION_KEY_SRV_TO_CLI 68
-#define EVP_KDF_SSHKDF_TYPE_INTEGRITY_KEY_CLI_TO_SRV  69
-#define EVP_KDF_SSHKDF_TYPE_INTEGRITY_KEY_SRV_TO_CLI  70
+#define EVP_KDF_SSHKDF_TYPE_INTEGRITY_KEY_CLI_TO_SRV 69
+#define EVP_KDF_SSHKDF_TYPE_INTEGRITY_KEY_SRV_TO_CLI 70
 
 /**** The legacy PKEY-based KDF API follows. ****/
 
-# define EVP_PKEY_CTRL_TLS_MD                   (EVP_PKEY_ALG_CTRL)
-# define EVP_PKEY_CTRL_TLS_SECRET               (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_TLS_SEED                 (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_HKDF_MD                  (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_HKDF_SALT                (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_HKDF_KEY                 (EVP_PKEY_ALG_CTRL + 5)
-# define EVP_PKEY_CTRL_HKDF_INFO                (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_HKDF_MODE                (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_PASS                     (EVP_PKEY_ALG_CTRL + 8)
-# define EVP_PKEY_CTRL_SCRYPT_SALT              (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_SCRYPT_N                 (EVP_PKEY_ALG_CTRL + 10)
-# define EVP_PKEY_CTRL_SCRYPT_R                 (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_SCRYPT_P                 (EVP_PKEY_ALG_CTRL + 12)
-# define EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES      (EVP_PKEY_ALG_CTRL + 13)
+#define EVP_PKEY_CTRL_TLS_MD (EVP_PKEY_ALG_CTRL)
+#define EVP_PKEY_CTRL_TLS_SECRET (EVP_PKEY_ALG_CTRL + 1)
+#define EVP_PKEY_CTRL_TLS_SEED (EVP_PKEY_ALG_CTRL + 2)
+#define EVP_PKEY_CTRL_HKDF_MD (EVP_PKEY_ALG_CTRL + 3)
+#define EVP_PKEY_CTRL_HKDF_SALT (EVP_PKEY_ALG_CTRL + 4)
+#define EVP_PKEY_CTRL_HKDF_KEY (EVP_PKEY_ALG_CTRL + 5)
+#define EVP_PKEY_CTRL_HKDF_INFO (EVP_PKEY_ALG_CTRL + 6)
+#define EVP_PKEY_CTRL_HKDF_MODE (EVP_PKEY_ALG_CTRL + 7)
+#define EVP_PKEY_CTRL_PASS (EVP_PKEY_ALG_CTRL + 8)
+#define EVP_PKEY_CTRL_SCRYPT_SALT (EVP_PKEY_ALG_CTRL + 9)
+#define EVP_PKEY_CTRL_SCRYPT_N (EVP_PKEY_ALG_CTRL + 10)
+#define EVP_PKEY_CTRL_SCRYPT_R (EVP_PKEY_ALG_CTRL + 11)
+#define EVP_PKEY_CTRL_SCRYPT_P (EVP_PKEY_ALG_CTRL + 12)
+#define EVP_PKEY_CTRL_SCRYPT_MAXMEM_BYTES (EVP_PKEY_ALG_CTRL + 13)
 
-# define EVP_PKEY_HKDEF_MODE_EXTRACT_AND_EXPAND \
-            EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND
-# define EVP_PKEY_HKDEF_MODE_EXTRACT_ONLY       \
-            EVP_KDF_HKDF_MODE_EXTRACT_ONLY
-# define EVP_PKEY_HKDEF_MODE_EXPAND_ONLY        \
-            EVP_KDF_HKDF_MODE_EXPAND_ONLY
+#define EVP_PKEY_HKDEF_MODE_EXTRACT_AND_EXPAND \
+    EVP_KDF_HKDF_MODE_EXTRACT_AND_EXPAND
+#define EVP_PKEY_HKDEF_MODE_EXTRACT_ONLY \
+    EVP_KDF_HKDF_MODE_EXTRACT_ONLY
+#define EVP_PKEY_HKDEF_MODE_EXPAND_ONLY \
+    EVP_KDF_HKDF_MODE_EXPAND_ONLY
 
 int EVP_PKEY_CTX_set_tls1_prf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 
 int EVP_PKEY_CTX_set1_tls1_prf_secret(EVP_PKEY_CTX *pctx,
-                                      const unsigned char *sec, int seclen);
+    const unsigned char *sec, int seclen);
 
 int EVP_PKEY_CTX_add1_tls1_prf_seed(EVP_PKEY_CTX *pctx,
-                                    const unsigned char *seed, int seedlen);
+    const unsigned char *seed, int seedlen);
 
 int EVP_PKEY_CTX_set_hkdf_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 
 int EVP_PKEY_CTX_set1_hkdf_salt(EVP_PKEY_CTX *ctx,
-                                const unsigned char *salt, int saltlen);
+    const unsigned char *salt, int saltlen);
 
 int EVP_PKEY_CTX_set1_hkdf_key(EVP_PKEY_CTX *ctx,
-                               const unsigned char *key, int keylen);
+    const unsigned char *key, int keylen);
 
 int EVP_PKEY_CTX_add1_hkdf_info(EVP_PKEY_CTX *ctx,
-                                const unsigned char *info, int infolen);
+    const unsigned char *info, int infolen);
 
 int EVP_PKEY_CTX_set_hkdf_mode(EVP_PKEY_CTX *ctx, int mode);
-# define EVP_PKEY_CTX_hkdf_mode EVP_PKEY_CTX_set_hkdf_mode
+#define EVP_PKEY_CTX_hkdf_mode EVP_PKEY_CTX_set_hkdf_mode
 
 int EVP_PKEY_CTX_set1_pbe_pass(EVP_PKEY_CTX *ctx, const char *pass,
-                               int passlen);
+    int passlen);
 
 int EVP_PKEY_CTX_set1_scrypt_salt(EVP_PKEY_CTX *ctx,
-                                  const unsigned char *salt, int saltlen);
+    const unsigned char *salt, int saltlen);
 
 int EVP_PKEY_CTX_set_scrypt_N(EVP_PKEY_CTX *ctx, uint64_t n);
 
@@ -129,10 +129,9 @@ int EVP_PKEY_CTX_set_scrypt_r(EVP_PKEY_CTX *ctx, uint64_t r);
 int EVP_PKEY_CTX_set_scrypt_p(EVP_PKEY_CTX *ctx, uint64_t p);
 
 int EVP_PKEY_CTX_set_scrypt_maxmem_bytes(EVP_PKEY_CTX *ctx,
-                                         uint64_t maxmem_bytes);
+    uint64_t maxmem_bytes);
 
-
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h
index 963d766dfc85..a2c1f24e046d 100644
--- a/include/openssl/kdferr.h
+++ b/include/openssl/kdferr.h
@@ -8,8 +8,8 @@
  */
 
 #ifndef OPENSSL_KDFERR_H
-# define OPENSSL_KDFERR_H
-# pragma once
+#define OPENSSL_KDFERR_H
+#pragma once
 
 #include <openssl/cryptoerr_legacy.h>
 
diff --git a/include/openssl/lhash.h.in b/include/openssl/lhash.h.in
index 63a9c53bfaf8..522724980ef2 100644
--- a/include/openssl/lhash.h.in
+++ b/include/openssl/lhash.h.in
@@ -7,42 +7,44 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_lhash_macros);
 -}
+/* clang-format on */
 
 /*
  * Header for dynamic hash table routines Author - Eric Young
  */
 
 #ifndef OPENSSL_LHASH_H
-# define OPENSSL_LHASH_H
-# pragma once
+#define OPENSSL_LHASH_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_LHASH_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_LHASH_H
+#endif
 
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/e_os2.h>
+#include <openssl/bio.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct lhash_node_st OPENSSL_LH_NODE;
-typedef int (*OPENSSL_LH_COMPFUNC) (const void *, const void *);
-typedef int (*OPENSSL_LH_COMPFUNCTHUNK) (const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
-typedef unsigned long (*OPENSSL_LH_HASHFUNC) (const void *);
-typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK) (const void *, OPENSSL_LH_HASHFUNC hfn);
-typedef void (*OPENSSL_LH_DOALL_FUNC) (void *);
-typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK) (void *, OPENSSL_LH_DOALL_FUNC doall);
-typedef void (*OPENSSL_LH_DOALL_FUNCARG) (void *, void *);
-typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK) (void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
+typedef int (*OPENSSL_LH_COMPFUNC)(const void *, const void *);
+typedef int (*OPENSSL_LH_COMPFUNCTHUNK)(const void *, const void *, OPENSSL_LH_COMPFUNC cfn);
+typedef unsigned long (*OPENSSL_LH_HASHFUNC)(const void *);
+typedef unsigned long (*OPENSSL_LH_HASHFUNCTHUNK)(const void *, OPENSSL_LH_HASHFUNC hfn);
+typedef void (*OPENSSL_LH_DOALL_FUNC)(void *);
+typedef void (*OPENSSL_LH_DOALL_FUNC_THUNK)(void *, OPENSSL_LH_DOALL_FUNC doall);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG)(void *, void *);
+typedef void (*OPENSSL_LH_DOALL_FUNCARG_THUNK)(void *, void *, OPENSSL_LH_DOALL_FUNCARG doall);
 typedef struct lhash_st OPENSSL_LHASH;
 
 /*
@@ -55,44 +57,49 @@ typedef struct lhash_st OPENSSL_LHASH;
  */
 
 /* First: "hash" functions */
-# define DECLARE_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *);
-# define IMPLEMENT_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *arg) { \
-                const o_type *a = arg; \
-                return name##_hash(a); }
-# define LHASH_HASH_FN(name) name##_LHASH_HASH
+#define DECLARE_LHASH_HASH_FN(name, o_type) \
+    unsigned long name##_LHASH_HASH(const void *);
+#define IMPLEMENT_LHASH_HASH_FN(name, o_type)        \
+    unsigned long name##_LHASH_HASH(const void *arg) \
+    {                                                \
+        const o_type *a = arg;                       \
+        return name##_hash(a);                       \
+    }
+#define LHASH_HASH_FN(name) name##_LHASH_HASH
 
 /* Second: "compare" functions */
-# define DECLARE_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *, const void *);
-# define IMPLEMENT_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *arg1, const void *arg2) { \
-                const o_type *a = arg1;             \
-                const o_type *b = arg2; \
-                return name##_cmp(a,b); }
-# define LHASH_COMP_FN(name) name##_LHASH_COMP
+#define DECLARE_LHASH_COMP_FN(name, o_type) \
+    int name##_LHASH_COMP(const void *, const void *);
+#define IMPLEMENT_LHASH_COMP_FN(name, o_type)                 \
+    int name##_LHASH_COMP(const void *arg1, const void *arg2) \
+    {                                                         \
+        const o_type *a = arg1;                               \
+        const o_type *b = arg2;                               \
+        return name##_cmp(a, b);                              \
+    }
+#define LHASH_COMP_FN(name) name##_LHASH_COMP
 
 /* Fourth: "doall_arg" functions */
-# define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *, void *);
-# define IMPLEMENT_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *arg1, void *arg2) { \
-                o_type *a = arg1; \
-                a_type *b = arg2; \
-                name##_doall_arg(a, b); }
-# define LHASH_DOALL_ARG_FN(name) name##_LHASH_DOALL_ARG
-
+#define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
+    void name##_LHASH_DOALL_ARG(void *, void *);
+#define IMPLEMENT_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
+    void name##_LHASH_DOALL_ARG(void *arg1, void *arg2)    \
+    {                                                      \
+        o_type *a = arg1;                                  \
+        a_type *b = arg2;                                  \
+        name##_doall_arg(a, b);                            \
+    }
+#define LHASH_DOALL_ARG_FN(name) name##_LHASH_DOALL_ARG
 
-# define LH_LOAD_MULT    256
+#define LH_LOAD_MULT 256
 
 int OPENSSL_LH_error(OPENSSL_LHASH *lh);
 OPENSSL_LHASH *OPENSSL_LH_new(OPENSSL_LH_HASHFUNC h, OPENSSL_LH_COMPFUNC c);
 OPENSSL_LHASH *OPENSSL_LH_set_thunks(OPENSSL_LHASH *lh,
-                                     OPENSSL_LH_HASHFUNCTHUNK hw,
-                                     OPENSSL_LH_COMPFUNCTHUNK cw,
-                                     OPENSSL_LH_DOALL_FUNC_THUNK daw,
-                                     OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
+    OPENSSL_LH_HASHFUNCTHUNK hw,
+    OPENSSL_LH_COMPFUNCTHUNK cw,
+    OPENSSL_LH_DOALL_FUNC_THUNK daw,
+    OPENSSL_LH_DOALL_FUNCARG_THUNK daaw);
 void OPENSSL_LH_free(OPENSSL_LHASH *lh);
 void OPENSSL_LH_flush(OPENSSL_LHASH *lh);
 void *OPENSSL_LH_insert(OPENSSL_LHASH *lh, void *data);
@@ -100,239 +107,249 @@ void *OPENSSL_LH_delete(OPENSSL_LHASH *lh, const void *data);
 void *OPENSSL_LH_retrieve(OPENSSL_LHASH *lh, const void *data);
 void OPENSSL_LH_doall(OPENSSL_LHASH *lh, OPENSSL_LH_DOALL_FUNC func);
 void OPENSSL_LH_doall_arg(OPENSSL_LHASH *lh,
-                          OPENSSL_LH_DOALL_FUNCARG func, void *arg);
+    OPENSSL_LH_DOALL_FUNCARG func, void *arg);
 void OPENSSL_LH_doall_arg_thunk(OPENSSL_LHASH *lh,
-                          OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
-                          OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
+    OPENSSL_LH_DOALL_FUNCARG_THUNK daaw,
+    OPENSSL_LH_DOALL_FUNCARG fn, void *arg);
 
 unsigned long OPENSSL_LH_strhash(const char *c);
 unsigned long OPENSSL_LH_num_items(const OPENSSL_LHASH *lh);
 unsigned long OPENSSL_LH_get_down_load(const OPENSSL_LHASH *lh);
 void OPENSSL_LH_set_down_load(OPENSSL_LHASH *lh, unsigned long down_load);
 
-# ifndef OPENSSL_NO_STDIO
-#  ifndef OPENSSL_NO_DEPRECATED_3_1
+#ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_DEPRECATED_3_1
 OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp);
 OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_stats(const OPENSSL_LHASH *lh, FILE *fp);
 OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats(const OPENSSL_LHASH *lh, FILE *fp);
-#  endif
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_1
+#endif
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_1
 OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
 OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
 OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define _LHASH OPENSSL_LHASH
-#  define LHASH_NODE OPENSSL_LH_NODE
-#  define lh_error OPENSSL_LH_error
-#  define lh_new OPENSSL_LH_new
-#  define lh_free OPENSSL_LH_free
-#  define lh_insert OPENSSL_LH_insert
-#  define lh_delete OPENSSL_LH_delete
-#  define lh_retrieve OPENSSL_LH_retrieve
-#  define lh_doall OPENSSL_LH_doall
-#  define lh_doall_arg OPENSSL_LH_doall_arg
-#  define lh_strhash OPENSSL_LH_strhash
-#  define lh_num_items OPENSSL_LH_num_items
-#  ifndef OPENSSL_NO_STDIO
-#   define lh_stats OPENSSL_LH_stats
-#   define lh_node_stats OPENSSL_LH_node_stats
-#   define lh_node_usage_stats OPENSSL_LH_node_usage_stats
-#  endif
-#  define lh_stats_bio OPENSSL_LH_stats_bio
-#  define lh_node_stats_bio OPENSSL_LH_node_stats_bio
-#  define lh_node_usage_stats_bio OPENSSL_LH_node_usage_stats_bio
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define _LHASH OPENSSL_LHASH
+#define LHASH_NODE OPENSSL_LH_NODE
+#define lh_error OPENSSL_LH_error
+#define lh_new OPENSSL_LH_new
+#define lh_free OPENSSL_LH_free
+#define lh_insert OPENSSL_LH_insert
+#define lh_delete OPENSSL_LH_delete
+#define lh_retrieve OPENSSL_LH_retrieve
+#define lh_doall OPENSSL_LH_doall
+#define lh_doall_arg OPENSSL_LH_doall_arg
+#define lh_strhash OPENSSL_LH_strhash
+#define lh_num_items OPENSSL_LH_num_items
+#ifndef OPENSSL_NO_STDIO
+#define lh_stats OPENSSL_LH_stats
+#define lh_node_stats OPENSSL_LH_node_stats
+#define lh_node_usage_stats OPENSSL_LH_node_usage_stats
+#endif
+#define lh_stats_bio OPENSSL_LH_stats_bio
+#define lh_node_stats_bio OPENSSL_LH_node_stats_bio
+#define lh_node_usage_stats_bio OPENSSL_LH_node_usage_stats_bio
+#endif
 
 /* Type checking... */
 
-# define LHASH_OF(type) struct lhash_st_##type
+#define LHASH_OF(type) struct lhash_st_##type
 
 /* Helper macro for internal use */
-# define DEFINE_LHASH_OF_INTERNAL(type) \
-    LHASH_OF(type) { \
-        union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
-    }; \
-    typedef int (*lh_##type##_compfunc)(const type *a, const type *b); \
-    typedef unsigned long (*lh_##type##_hashfunc)(const type *a); \
-    typedef void (*lh_##type##_doallfunc)(type *a); \
-    static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
-    { \
-        unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
-        return hfn_conv((const type *)data); \
-    } \
-    static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
-    { \
-        int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
-        return cfn_conv((const type *)da, (const type *)db); \
-    } \
-    static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
-    { \
-        void (*doall_conv)(type *) = (void (*)(type *))doall; \
-        doall_conv((type *)node); \
-    } \
+#define DEFINE_LHASH_OF_INTERNAL(type)                                                                         \
+    LHASH_OF(type)                                                                                             \
+    {                                                                                                          \
+        union lh_##type##_dummy {                                                                              \
+            void *d1;                                                                                          \
+            unsigned long d2;                                                                                  \
+            int d3;                                                                                            \
+        } dummy;                                                                                               \
+    };                                                                                                         \
+    typedef int (*lh_##type##_compfunc)(const type *a, const type *b);                                         \
+    typedef unsigned long (*lh_##type##_hashfunc)(const type *a);                                              \
+    typedef void (*lh_##type##_doallfunc)(type * a);                                                           \
+    static ossl_inline unsigned long lh_##type##_hash_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn)         \
+    {                                                                                                          \
+        unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn;                        \
+        return hfn_conv((const type *)data);                                                                   \
+    }                                                                                                          \
+    static ossl_inline int lh_##type##_comp_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn)     \
+    {                                                                                                          \
+        int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn;                \
+        return cfn_conv((const type *)da, (const type *)db);                                                   \
+    }                                                                                                          \
+    static ossl_inline void lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall)                   \
+    {                                                                                                          \
+        void (*doall_conv)(type *) = (void (*)(type *))doall;                                                  \
+        doall_conv((type *)node);                                                                              \
+    }                                                                                                          \
     static ossl_inline void lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
-    { \
-        void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
-        doall_conv((type *)node, arg); \
-    } \
-    static ossl_unused ossl_inline type *\
-    ossl_check_##type##_lh_plain_type(type *ptr) \
-    { \
-        return ptr; \
-    } \
-    static ossl_unused ossl_inline const type * \
-    ossl_check_const_##type##_lh_plain_type(const type *ptr) \
-    { \
-        return ptr; \
-    } \
-    static ossl_unused ossl_inline const OPENSSL_LHASH * \
-    ossl_check_const_##type##_lh_type(const LHASH_OF(type) *lh) \
-    { \
-        return (const OPENSSL_LHASH *)lh; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_LHASH * \
-    ossl_check_##type##_lh_type(LHASH_OF(type) *lh) \
-    { \
-        return (OPENSSL_LHASH *)lh; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_LH_COMPFUNC \
-    ossl_check_##type##_lh_compfunc_type(lh_##type##_compfunc cmp) \
-    { \
-        return (OPENSSL_LH_COMPFUNC)cmp; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_LH_HASHFUNC \
-    ossl_check_##type##_lh_hashfunc_type(lh_##type##_hashfunc hfn) \
-    { \
-        return (OPENSSL_LH_HASHFUNC)hfn; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_LH_DOALL_FUNC \
-    ossl_check_##type##_lh_doallfunc_type(lh_##type##_doallfunc dfn) \
-    { \
-        return (OPENSSL_LH_DOALL_FUNC)dfn; \
-    } \
+    {                                                                                                          \
+        void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall;                                  \
+        doall_conv((type *)node, arg);                                                                         \
+    }                                                                                                          \
+    static ossl_unused ossl_inline type *                                                                      \
+    ossl_check_##type##_lh_plain_type(type *ptr)                                                               \
+    {                                                                                                          \
+        return ptr;                                                                                            \
+    }                                                                                                          \
+    static ossl_unused ossl_inline const type *                                                                \
+    ossl_check_const_##type##_lh_plain_type(const type *ptr)                                                   \
+    {                                                                                                          \
+        return ptr;                                                                                            \
+    }                                                                                                          \
+    static ossl_unused ossl_inline const OPENSSL_LHASH *                                                       \
+    ossl_check_const_##type##_lh_type(const LHASH_OF(type) *lh)                                                \
+    {                                                                                                          \
+        return (const OPENSSL_LHASH *)lh;                                                                      \
+    }                                                                                                          \
+    static ossl_unused ossl_inline OPENSSL_LHASH *                                                             \
+    ossl_check_##type##_lh_type(LHASH_OF(type) *lh)                                                            \
+    {                                                                                                          \
+        return (OPENSSL_LHASH *)lh;                                                                            \
+    }                                                                                                          \
+    static ossl_unused ossl_inline OPENSSL_LH_COMPFUNC                                                         \
+    ossl_check_##type##_lh_compfunc_type(lh_##type##_compfunc cmp)                                             \
+    {                                                                                                          \
+        return (OPENSSL_LH_COMPFUNC)cmp;                                                                       \
+    }                                                                                                          \
+    static ossl_unused ossl_inline OPENSSL_LH_HASHFUNC                                                         \
+    ossl_check_##type##_lh_hashfunc_type(lh_##type##_hashfunc hfn)                                             \
+    {                                                                                                          \
+        return (OPENSSL_LH_HASHFUNC)hfn;                                                                       \
+    }                                                                                                          \
+    static ossl_unused ossl_inline OPENSSL_LH_DOALL_FUNC                                                       \
+    ossl_check_##type##_lh_doallfunc_type(lh_##type##_doallfunc dfn)                                           \
+    {                                                                                                          \
+        return (OPENSSL_LH_DOALL_FUNC)dfn;                                                                     \
+    }                                                                                                          \
     LHASH_OF(type)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_1
-#  define DEFINE_LHASH_OF_DEPRECATED(type) \
-    static ossl_unused ossl_inline void \
-    lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
-    { \
-        OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out); \
-    } \
-    static ossl_unused ossl_inline void \
+#ifndef OPENSSL_NO_DEPRECATED_3_1
+#define DEFINE_LHASH_OF_DEPRECATED(type)                                 \
+    static ossl_unused ossl_inline void                                  \
+    lh_##type##_node_stats_bio(const LHASH_OF(type) *lh, BIO *out)       \
+    {                                                                    \
+        OPENSSL_LH_node_stats_bio((const OPENSSL_LHASH *)lh, out);       \
+    }                                                                    \
+    static ossl_unused ossl_inline void                                  \
     lh_##type##_node_usage_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
-    { \
+    {                                                                    \
         OPENSSL_LH_node_usage_stats_bio((const OPENSSL_LHASH *)lh, out); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out) \
-    { \
-        OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out); \
+    }                                                                    \
+    static ossl_unused ossl_inline void                                  \
+    lh_##type##_stats_bio(const LHASH_OF(type) *lh, BIO *out)            \
+    {                                                                    \
+        OPENSSL_LH_stats_bio((const OPENSSL_LHASH *)lh, out);            \
     }
-# else
-#  define DEFINE_LHASH_OF_DEPRECATED(type)
-# endif
+#else
+#define DEFINE_LHASH_OF_DEPRECATED(type)
+#endif
 
-# define DEFINE_LHASH_OF_EX(type) \
-    LHASH_OF(type) { \
-        union lh_##type##_dummy { void* d1; unsigned long d2; int d3; } dummy; \
-    }; \
-    static unsigned long \
-    lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn) \
-    { \
-        unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn; \
-        return hfn_conv((const type *)data); \
-    } \
-    static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn) \
-    { \
-        int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn; \
-        return cfn_conv((const type *)da, (const type *)db); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_free(LHASH_OF(type) *lh) \
-    { \
-        OPENSSL_LH_free((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_flush(LHASH_OF(type) *lh) \
-    { \
-        OPENSSL_LH_flush((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_unused ossl_inline type * \
-    lh_##type##_insert(LHASH_OF(type) *lh, type *d) \
-    { \
-        return (type *)OPENSSL_LH_insert((OPENSSL_LHASH *)lh, d); \
-    } \
-    static ossl_unused ossl_inline type * \
-    lh_##type##_delete(LHASH_OF(type) *lh, const type *d) \
-    { \
-        return (type *)OPENSSL_LH_delete((OPENSSL_LHASH *)lh, d); \
-    } \
-    static ossl_unused ossl_inline type * \
-    lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d) \
-    { \
-        return (type *)OPENSSL_LH_retrieve((OPENSSL_LHASH *)lh, d); \
-    } \
-    static ossl_unused ossl_inline int \
-    lh_##type##_error(LHASH_OF(type) *lh) \
-    { \
-        return OPENSSL_LH_error((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_unused ossl_inline unsigned long \
-    lh_##type##_num_items(LHASH_OF(type) *lh) \
-    { \
-        return OPENSSL_LH_num_items((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_unused ossl_inline unsigned long \
-    lh_##type##_get_down_load(LHASH_OF(type) *lh) \
-    { \
-        return OPENSSL_LH_get_down_load((OPENSSL_LHASH *)lh); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl) \
-    { \
-        OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall) \
-    { \
-        void (*doall_conv)(type *) = (void (*)(type *))doall; \
-        doall_conv((type *)node); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall) \
-    { \
-        void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall; \
-        doall_conv((type *)node, arg); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *)) \
-    { \
-        OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall); \
-    } \
-    static ossl_unused ossl_inline LHASH_OF(type) * \
-    lh_##type##_new(unsigned long (*hfn)(const type *), \
-                    int (*cfn)(const type *, const type *)) \
-    { \
+#define DEFINE_LHASH_OF_EX(type)                                                                                           \
+    LHASH_OF(type)                                                                                                         \
+    {                                                                                                                      \
+        union lh_##type##_dummy {                                                                                          \
+            void *d1;                                                                                                      \
+            unsigned long d2;                                                                                              \
+            int d3;                                                                                                        \
+        } dummy;                                                                                                           \
+    };                                                                                                                     \
+    static unsigned long                                                                                                   \
+    lh_##type##_hfn_thunk(const void *data, OPENSSL_LH_HASHFUNC hfn)                                                       \
+    {                                                                                                                      \
+        unsigned long (*hfn_conv)(const type *) = (unsigned long (*)(const type *))hfn;                                    \
+        return hfn_conv((const type *)data);                                                                               \
+    }                                                                                                                      \
+    static int lh_##type##_cfn_thunk(const void *da, const void *db, OPENSSL_LH_COMPFUNC cfn)                              \
+    {                                                                                                                      \
+        int (*cfn_conv)(const type *, const type *) = (int (*)(const type *, const type *))cfn;                            \
+        return cfn_conv((const type *)da, (const type *)db);                                                               \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_free(LHASH_OF(type) *lh)                                                                                   \
+    {                                                                                                                      \
+        OPENSSL_LH_free((OPENSSL_LHASH *)lh);                                                                              \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_flush(LHASH_OF(type) *lh)                                                                                  \
+    {                                                                                                                      \
+        OPENSSL_LH_flush((OPENSSL_LHASH *)lh);                                                                             \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline type *                                                                                  \
+    lh_##type##_insert(LHASH_OF(type) *lh, type *d)                                                                        \
+    {                                                                                                                      \
+        return (type *)OPENSSL_LH_insert((OPENSSL_LHASH *)lh, d);                                                          \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline type *                                                                                  \
+    lh_##type##_delete(LHASH_OF(type) *lh, const type *d)                                                                  \
+    {                                                                                                                      \
+        return (type *)OPENSSL_LH_delete((OPENSSL_LHASH *)lh, d);                                                          \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline type *                                                                                  \
+    lh_##type##_retrieve(LHASH_OF(type) *lh, const type *d)                                                                \
+    {                                                                                                                      \
+        return (type *)OPENSSL_LH_retrieve((OPENSSL_LHASH *)lh, d);                                                        \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int                                                                                     \
+    lh_##type##_error(LHASH_OF(type) *lh)                                                                                  \
+    {                                                                                                                      \
+        return OPENSSL_LH_error((OPENSSL_LHASH *)lh);                                                                      \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline unsigned long                                                                           \
+    lh_##type##_num_items(LHASH_OF(type) *lh)                                                                              \
+    {                                                                                                                      \
+        return OPENSSL_LH_num_items((OPENSSL_LHASH *)lh);                                                                  \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline unsigned long                                                                           \
+    lh_##type##_get_down_load(LHASH_OF(type) *lh)                                                                          \
+    {                                                                                                                      \
+        return OPENSSL_LH_get_down_load((OPENSSL_LHASH *)lh);                                                              \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_set_down_load(LHASH_OF(type) *lh, unsigned long dl)                                                        \
+    {                                                                                                                      \
+        OPENSSL_LH_set_down_load((OPENSSL_LHASH *)lh, dl);                                                                 \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_doall_thunk(void *node, OPENSSL_LH_DOALL_FUNC doall)                                                       \
+    {                                                                                                                      \
+        void (*doall_conv)(type *) = (void (*)(type *))doall;                                                              \
+        doall_conv((type *)node);                                                                                          \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_doall_arg_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG doall)                                     \
+    {                                                                                                                      \
+        void (*doall_conv)(type *, void *) = (void (*)(type *, void *))doall;                                              \
+        doall_conv((type *)node, arg);                                                                                     \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_doall(LHASH_OF(type) *lh, void (*doall)(type *))                                                           \
+    {                                                                                                                      \
+        OPENSSL_LH_doall((OPENSSL_LHASH *)lh, (OPENSSL_LH_DOALL_FUNC)doall);                                               \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline LHASH_OF(type) *                                                                        \
+    lh_##type##_new(unsigned long (*hfn)(const type *),                                                                    \
+        int (*cfn)(const type *, const type *))                                                                            \
+    {                                                                                                                      \
         return (LHASH_OF(type) *)OPENSSL_LH_set_thunks(OPENSSL_LH_new((OPENSSL_LH_HASHFUNC)hfn, (OPENSSL_LH_COMPFUNC)cfn), \
-                                lh_##type##_hfn_thunk, lh_##type##_cfn_thunk, \
-                                lh_##type##_doall_thunk, \
-                                lh_##type##_doall_arg_thunk); \
-    } \
-    static ossl_unused ossl_inline void \
-    lh_##type##_doall_arg(LHASH_OF(type) *lh, \
-                          void (*doallarg)(type *, void *), void *arg) \
-    { \
-        OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh, \
-                             (OPENSSL_LH_DOALL_FUNCARG)doallarg, arg); \
-    } \
+            lh_##type##_hfn_thunk, lh_##type##_cfn_thunk,                                                                  \
+            lh_##type##_doall_thunk,                                                                                       \
+            lh_##type##_doall_arg_thunk);                                                                                  \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void                                                                                    \
+    lh_##type##_doall_arg(LHASH_OF(type) *lh,                                                                              \
+        void (*doallarg)(type *, void *), void *arg)                                                                       \
+    {                                                                                                                      \
+        OPENSSL_LH_doall_arg((OPENSSL_LHASH *)lh,                                                                          \
+            (OPENSSL_LH_DOALL_FUNCARG)doallarg, arg);                                                                      \
+    }                                                                                                                      \
     LHASH_OF(type)
 
-# define DEFINE_LHASH_OF(type) \
-    DEFINE_LHASH_OF_EX(type); \
+#define DEFINE_LHASH_OF(type)        \
+    DEFINE_LHASH_OF_EX(type);        \
     DEFINE_LHASH_OF_DEPRECATED(type) \
     LHASH_OF(type)
 
@@ -342,31 +359,33 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
 #define IMPLEMENT_LHASH_DOALL_ARG(type, argtype) \
     int_implement_lhash_doall(type, argtype, type)
 
-#define int_implement_lhash_doall(type, argtype, cbargtype) \
-    static ossl_unused ossl_inline void \
+#define int_implement_lhash_doall(type, argtype, cbargtype)                                 \
+    static ossl_unused ossl_inline void                                                     \
     lh_##type##_doall_##argtype##_thunk(void *node, void *arg, OPENSSL_LH_DOALL_FUNCARG fn) \
-    { \
-        void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn; \
-        fn_conv((cbargtype *)node, (argtype *)arg); \
-    } \
-    static ossl_unused ossl_inline void \
-        lh_##type##_doall_##argtype(LHASH_OF(type) *lh, \
-                                   void (*fn)(cbargtype *, argtype *), \
-                                   argtype *arg) \
-    { \
-        OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh, \
-                             lh_##type##_doall_##argtype##_thunk, \
-                             (OPENSSL_LH_DOALL_FUNCARG)fn, \
-                             (void *)arg); \
-    } \
+    {                                                                                       \
+        void (*fn_conv)(cbargtype *, argtype *) = (void (*)(cbargtype *, argtype *))fn;     \
+        fn_conv((cbargtype *)node, (argtype *)arg);                                         \
+    }                                                                                       \
+    static ossl_unused ossl_inline void                                                     \
+    lh_##type##_doall_##argtype(LHASH_OF(type) *lh,                                         \
+        void (*fn)(cbargtype *, argtype *),                                                 \
+        argtype *arg)                                                                       \
+    {                                                                                       \
+        OPENSSL_LH_doall_arg_thunk((OPENSSL_LHASH *)lh,                                     \
+            lh_##type##_doall_##argtype##_thunk,                                            \
+            (OPENSSL_LH_DOALL_FUNCARG)fn,                                                   \
+            (void *)arg);                                                                   \
+    }                                                                                       \
     LHASH_OF(type)
 
+/* clang-format off */
 {-
     generate_lhash_macros("OPENSSL_STRING")
     .generate_lhash_macros("OPENSSL_CSTRING");
 -}
+/* clang-format on */
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index 296723ec4237..de34b4640d49 100644
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -8,22 +8,21 @@
  */
 
 #ifndef OPENSSL_MACROS_H
-# define OPENSSL_MACROS_H
-# pragma once
+#define OPENSSL_MACROS_H
+#pragma once
 
 #include <openssl/opensslconf.h>
 #include <openssl/opensslv.h>
 
-
 /* Helper macros for CPP string composition */
-# define OPENSSL_MSTR_HELPER(x) #x
-# define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
+#define OPENSSL_MSTR_HELPER(x) #x
+#define OPENSSL_MSTR(x) OPENSSL_MSTR_HELPER(x)
 
 /*
  * Sometimes OPENSSL_NO_xxx ends up with an empty file and some compilers
  * don't like that.  This will hopefully silence them.
  */
-# define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
+#define NON_EMPTY_TRANSLATION_UNIT static void *dummy = &dummy;
 
 /*
  * Generic deprecation macro
@@ -31,54 +30,54 @@
  * If OPENSSL_SUPPRESS_DEPRECATED is defined, then OSSL_DEPRECATED and
  * OSSL_DEPRECATED_FOR become no-ops
  */
-# ifndef OSSL_DEPRECATED
-#  undef OSSL_DEPRECATED_FOR
-#  ifndef OPENSSL_SUPPRESS_DEPRECATED
-#   if defined(_MSC_VER)
-     /*
-      * MSVC supports __declspec(deprecated) since MSVC 2003 (13.10),
-      * and __declspec(deprecated(message)) since MSVC 2005 (14.00)
-      */
-#    if _MSC_VER >= 1400
-#     define OSSL_DEPRECATED(since) \
-          __declspec(deprecated("Since OpenSSL " # since))
-#     define OSSL_DEPRECATED_FOR(since, message) \
-          __declspec(deprecated("Since OpenSSL " # since ";" message))
-#    elif _MSC_VER >= 1310
-#     define OSSL_DEPRECATED(since) __declspec(deprecated)
-#     define OSSL_DEPRECATED_FOR(since, message) __declspec(deprecated)
-#    endif
-#   elif defined(__GNUC__)
-     /*
-      * According to GCC documentation, deprecations with message appeared in
-      * GCC 4.5.0
-      */
-#    if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-#     define OSSL_DEPRECATED(since) \
-          __attribute__((deprecated("Since OpenSSL " # since)))
-#     define OSSL_DEPRECATED_FOR(since, message) \
-          __attribute__((deprecated("Since OpenSSL " # since ";" message)))
-#    elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
-#     define OSSL_DEPRECATED(since) __attribute__((deprecated))
-#     define OSSL_DEPRECATED_FOR(since, message) __attribute__((deprecated))
-#    endif
-#   elif defined(__SUNPRO_C)
-#    if (__SUNPRO_C >= 0x5130)
-#     define OSSL_DEPRECATED(since) __attribute__ ((deprecated))
-#     define OSSL_DEPRECATED_FOR(since, message) __attribute__ ((deprecated))
-#    endif
-#   endif
-#  endif
-# endif
+#ifndef OSSL_DEPRECATED
+#undef OSSL_DEPRECATED_FOR
+#ifndef OPENSSL_SUPPRESS_DEPRECATED
+#if defined(_MSC_VER)
+/*
+ * MSVC supports __declspec(deprecated) since MSVC 2003 (13.10),
+ * and __declspec(deprecated(message)) since MSVC 2005 (14.00)
+ */
+#if _MSC_VER >= 1400
+#define OSSL_DEPRECATED(since) \
+    __declspec(deprecated("Since OpenSSL " #since))
+#define OSSL_DEPRECATED_FOR(since, message) \
+    __declspec(deprecated("Since OpenSSL " #since ";" message))
+#elif _MSC_VER >= 1310
+#define OSSL_DEPRECATED(since) __declspec(deprecated)
+#define OSSL_DEPRECATED_FOR(since, message) __declspec(deprecated)
+#endif
+#elif defined(__GNUC__)
+/*
+ * According to GCC documentation, deprecations with message appeared in
+ * GCC 4.5.0
+ */
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#define OSSL_DEPRECATED(since) \
+    __attribute__((deprecated("Since OpenSSL " #since)))
+#define OSSL_DEPRECATED_FOR(since, message) \
+    __attribute__((deprecated("Since OpenSSL " #since ";" message)))
+#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+#define OSSL_DEPRECATED(since) __attribute__((deprecated))
+#define OSSL_DEPRECATED_FOR(since, message) __attribute__((deprecated))
+#endif
+#elif defined(__SUNPRO_C)
+#if (__SUNPRO_C >= 0x5130)
+#define OSSL_DEPRECATED(since) __attribute__((deprecated))
+#define OSSL_DEPRECATED_FOR(since, message) __attribute__((deprecated))
+#endif
+#endif
+#endif
+#endif
 
 /*
  * Still not defined?  Then define no-op macros. This means these macros
  * are unsuitable for use in a typedef.
  */
-# ifndef OSSL_DEPRECATED
-#  define OSSL_DEPRECATED(since)                extern
-#  define OSSL_DEPRECATED_FOR(since, message)   extern
-# endif
+#ifndef OSSL_DEPRECATED
+#define OSSL_DEPRECATED(since) extern
+#define OSSL_DEPRECATED_FOR(since, message) extern
+#endif
 
 /*
  * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
@@ -101,9 +100,9 @@
  * macros are used to enable or disable features at that API version boundary.
  */
 
-# ifdef OPENSSL_API_LEVEL
-#  error "OPENSSL_API_LEVEL must not be defined by application"
-# endif
+#ifdef OPENSSL_API_LEVEL
+#error "OPENSSL_API_LEVEL must not be defined by application"
+#endif
 
 /*
  * We figure out what API level was intended by simple numeric comparison.
@@ -111,49 +110,49 @@
  * safety margin and assume that anything below 0x00900000L is a new style
  * number.  This allows new versions up to and including v943.71.83.
  */
-# ifdef OPENSSL_API_COMPAT
-#  if OPENSSL_API_COMPAT < 0x900000L
-#   define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
-#  else
-#   define OPENSSL_API_LEVEL                            \
-           (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000  \
-            + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
-            + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
-#  endif
-# endif
+#ifdef OPENSSL_API_COMPAT
+#if OPENSSL_API_COMPAT < 0x900000L
+#define OPENSSL_API_LEVEL (OPENSSL_API_COMPAT)
+#else
+#define OPENSSL_API_LEVEL                           \
+    (((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000     \
+        + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+        + ((OPENSSL_API_COMPAT >> 12) & 0xFF))
+#endif
+#endif
 
 /*
  * If OPENSSL_API_COMPAT wasn't given, we use default numbers to set
  * the API compatibility level.
  */
-# ifndef OPENSSL_API_LEVEL
-#  if OPENSSL_CONFIGURED_API > 0
-#   define OPENSSL_API_LEVEL (OPENSSL_CONFIGURED_API)
-#  else
-#   define OPENSSL_API_LEVEL \
-           (OPENSSL_VERSION_MAJOR * 10000 + OPENSSL_VERSION_MINOR * 100)
-#  endif
-# endif
+#ifndef OPENSSL_API_LEVEL
+#if OPENSSL_CONFIGURED_API > 0
+#define OPENSSL_API_LEVEL (OPENSSL_CONFIGURED_API)
+#else
+#define OPENSSL_API_LEVEL \
+    (OPENSSL_VERSION_MAJOR * 10000 + OPENSSL_VERSION_MINOR * 100)
+#endif
+#endif
 
-# if OPENSSL_API_LEVEL > OPENSSL_CONFIGURED_API
-#  error "The requested API level higher than the configured API compatibility level"
-# endif
+#if OPENSSL_API_LEVEL > OPENSSL_CONFIGURED_API
+#error "The requested API level higher than the configured API compatibility level"
+#endif
 
 /*
  * Check of sane values.
  */
 /* Can't go higher than the current version. */
-# if OPENSSL_API_LEVEL > (OPENSSL_VERSION_MAJOR * 10000 + OPENSSL_VERSION_MINOR * 100)
-#  error "OPENSSL_API_COMPAT expresses an impossible API compatibility level"
-# endif
+#if OPENSSL_API_LEVEL > (OPENSSL_VERSION_MAJOR * 10000 + OPENSSL_VERSION_MINOR * 100)
+#error "OPENSSL_API_COMPAT expresses an impossible API compatibility level"
+#endif
 /* OpenSSL will have no version 2.y.z */
-# if OPENSSL_API_LEVEL < 30000 && OPENSSL_API_LEVEL >= 20000
-#  error "OPENSSL_API_COMPAT expresses an impossible API compatibility level"
-# endif
+#if OPENSSL_API_LEVEL < 30000 && OPENSSL_API_LEVEL >= 20000
+#error "OPENSSL_API_COMPAT expresses an impossible API compatibility level"
+#endif
 /* Below 0.9.8 is unacceptably low */
-# if OPENSSL_API_LEVEL < 908
-#  error "OPENSSL_API_COMPAT expresses an impossible API compatibility level"
-# endif
+#if OPENSSL_API_LEVEL < 908
+#error "OPENSSL_API_COMPAT expresses an impossible API compatibility level"
+#endif
 
 /*
  * Define macros for deprecation and simulated removal purposes.
@@ -169,140 +168,140 @@
  * 'no-deprecated'.
  */
 
-# undef OPENSSL_NO_DEPRECATED_3_4
-# undef OPENSSL_NO_DEPRECATED_3_1
-# undef OPENSSL_NO_DEPRECATED_3_0
-# undef OPENSSL_NO_DEPRECATED_1_1_1
-# undef OPENSSL_NO_DEPRECATED_1_1_0
-# undef OPENSSL_NO_DEPRECATED_1_0_2
-# undef OPENSSL_NO_DEPRECATED_1_0_1
-# undef OPENSSL_NO_DEPRECATED_1_0_0
-# undef OPENSSL_NO_DEPRECATED_0_9_8
+#undef OPENSSL_NO_DEPRECATED_3_4
+#undef OPENSSL_NO_DEPRECATED_3_1
+#undef OPENSSL_NO_DEPRECATED_3_0
+#undef OPENSSL_NO_DEPRECATED_1_1_1
+#undef OPENSSL_NO_DEPRECATED_1_1_0
+#undef OPENSSL_NO_DEPRECATED_1_0_2
+#undef OPENSSL_NO_DEPRECATED_1_0_1
+#undef OPENSSL_NO_DEPRECATED_1_0_0
+#undef OPENSSL_NO_DEPRECATED_0_9_8
 
-# if OPENSSL_API_LEVEL >= 30500
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_3_5                OSSL_DEPRECATED(3.5)
-#   define OSSL_DEPRECATEDIN_3_5_FOR(msg)       OSSL_DEPRECATED_FOR(3.5, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_3_5
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_3_5
-#  define OSSL_DEPRECATEDIN_3_5_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 30400
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_3_4                OSSL_DEPRECATED(3.4)
-#   define OSSL_DEPRECATEDIN_3_4_FOR(msg)       OSSL_DEPRECATED_FOR(3.4, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_3_4
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_3_4
-#  define OSSL_DEPRECATEDIN_3_4_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 30100
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_3_1                OSSL_DEPRECATED(3.1)
-#   define OSSL_DEPRECATEDIN_3_1_FOR(msg)       OSSL_DEPRECATED_FOR(3.1, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_3_1
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_3_1
-#  define OSSL_DEPRECATEDIN_3_1_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 30000
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_3_0                OSSL_DEPRECATED(3.0)
-#   define OSSL_DEPRECATEDIN_3_0_FOR(msg)       OSSL_DEPRECATED_FOR(3.0, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_3_0
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_3_0
-#  define OSSL_DEPRECATEDIN_3_0_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 10101
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_1_1_1              OSSL_DEPRECATED(1.1.1)
-#   define OSSL_DEPRECATEDIN_1_1_1_FOR(msg)     OSSL_DEPRECATED_FOR(1.1.1, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_1_1_1
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_1_1_1
-#  define OSSL_DEPRECATEDIN_1_1_1_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 10100
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_1_1_0              OSSL_DEPRECATED(1.1.0)
-#   define OSSL_DEPRECATEDIN_1_1_0_FOR(msg)     OSSL_DEPRECATED_FOR(1.1.0, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_1_1_0
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_1_1_0
-#  define OSSL_DEPRECATEDIN_1_1_0_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 10002
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_1_0_2              OSSL_DEPRECATED(1.0.2)
-#   define OSSL_DEPRECATEDIN_1_0_2_FOR(msg)     OSSL_DEPRECATED_FOR(1.0.2, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_1_0_2
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_1_0_2
-#  define OSSL_DEPRECATEDIN_1_0_2_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 10001
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_1_0_1              OSSL_DEPRECATED(1.0.1)
-#   define OSSL_DEPRECATEDIN_1_0_1_FOR(msg)     OSSL_DEPRECATED_FOR(1.0.1, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_1_0_1
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_1_0_1
-#  define OSSL_DEPRECATEDIN_1_0_1_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 10000
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_1_0_0              OSSL_DEPRECATED(1.0.0)
-#   define OSSL_DEPRECATEDIN_1_0_0_FOR(msg)     OSSL_DEPRECATED_FOR(1.0.0, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_1_0_0
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_1_0_0
-#  define OSSL_DEPRECATEDIN_1_0_0_FOR(msg)
-# endif
-# if OPENSSL_API_LEVEL >= 908
-#  ifndef OPENSSL_NO_DEPRECATED
-#   define OSSL_DEPRECATEDIN_0_9_8              OSSL_DEPRECATED(0.9.8)
-#   define OSSL_DEPRECATEDIN_0_9_8_FOR(msg)     OSSL_DEPRECATED_FOR(0.9.8, msg)
-#  else
-#   define OPENSSL_NO_DEPRECATED_0_9_8
-#  endif
-# else
-#  define OSSL_DEPRECATEDIN_0_9_8
-#  define OSSL_DEPRECATEDIN_0_9_8_FOR(msg)
-# endif
+#if OPENSSL_API_LEVEL >= 30500
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_3_5 OSSL_DEPRECATED(3.5)
+#define OSSL_DEPRECATEDIN_3_5_FOR(msg) OSSL_DEPRECATED_FOR(3.5, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_3_5
+#endif
+#else
+#define OSSL_DEPRECATEDIN_3_5
+#define OSSL_DEPRECATEDIN_3_5_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 30400
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_3_4 OSSL_DEPRECATED(3.4)
+#define OSSL_DEPRECATEDIN_3_4_FOR(msg) OSSL_DEPRECATED_FOR(3.4, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_3_4
+#endif
+#else
+#define OSSL_DEPRECATEDIN_3_4
+#define OSSL_DEPRECATEDIN_3_4_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 30100
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_3_1 OSSL_DEPRECATED(3.1)
+#define OSSL_DEPRECATEDIN_3_1_FOR(msg) OSSL_DEPRECATED_FOR(3.1, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_3_1
+#endif
+#else
+#define OSSL_DEPRECATEDIN_3_1
+#define OSSL_DEPRECATEDIN_3_1_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 30000
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_3_0 OSSL_DEPRECATED(3.0)
+#define OSSL_DEPRECATEDIN_3_0_FOR(msg) OSSL_DEPRECATED_FOR(3.0, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_3_0
+#endif
+#else
+#define OSSL_DEPRECATEDIN_3_0
+#define OSSL_DEPRECATEDIN_3_0_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 10101
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_1_1_1 OSSL_DEPRECATED(1.1.1)
+#define OSSL_DEPRECATEDIN_1_1_1_FOR(msg) OSSL_DEPRECATED_FOR(1.1.1, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_1_1_1
+#endif
+#else
+#define OSSL_DEPRECATEDIN_1_1_1
+#define OSSL_DEPRECATEDIN_1_1_1_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 10100
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_1_1_0 OSSL_DEPRECATED(1.1.0)
+#define OSSL_DEPRECATEDIN_1_1_0_FOR(msg) OSSL_DEPRECATED_FOR(1.1.0, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_1_1_0
+#endif
+#else
+#define OSSL_DEPRECATEDIN_1_1_0
+#define OSSL_DEPRECATEDIN_1_1_0_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 10002
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_1_0_2 OSSL_DEPRECATED(1.0.2)
+#define OSSL_DEPRECATEDIN_1_0_2_FOR(msg) OSSL_DEPRECATED_FOR(1.0.2, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_1_0_2
+#endif
+#else
+#define OSSL_DEPRECATEDIN_1_0_2
+#define OSSL_DEPRECATEDIN_1_0_2_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 10001
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_1_0_1 OSSL_DEPRECATED(1.0.1)
+#define OSSL_DEPRECATEDIN_1_0_1_FOR(msg) OSSL_DEPRECATED_FOR(1.0.1, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_1_0_1
+#endif
+#else
+#define OSSL_DEPRECATEDIN_1_0_1
+#define OSSL_DEPRECATEDIN_1_0_1_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 10000
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_1_0_0 OSSL_DEPRECATED(1.0.0)
+#define OSSL_DEPRECATEDIN_1_0_0_FOR(msg) OSSL_DEPRECATED_FOR(1.0.0, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_1_0_0
+#endif
+#else
+#define OSSL_DEPRECATEDIN_1_0_0
+#define OSSL_DEPRECATEDIN_1_0_0_FOR(msg)
+#endif
+#if OPENSSL_API_LEVEL >= 908
+#ifndef OPENSSL_NO_DEPRECATED
+#define OSSL_DEPRECATEDIN_0_9_8 OSSL_DEPRECATED(0.9.8)
+#define OSSL_DEPRECATEDIN_0_9_8_FOR(msg) OSSL_DEPRECATED_FOR(0.9.8, msg)
+#else
+#define OPENSSL_NO_DEPRECATED_0_9_8
+#endif
+#else
+#define OSSL_DEPRECATEDIN_0_9_8
+#define OSSL_DEPRECATEDIN_0_9_8_FOR(msg)
+#endif
 
 /*
  * Make our own variants of __FILE__ and __LINE__, depending on configuration
  */
 
-# ifndef OPENSSL_FILE
-#  ifdef OPENSSL_NO_FILENAMES
-#   define OPENSSL_FILE ""
-#   define OPENSSL_LINE 0
-#  else
-#   define OPENSSL_FILE __FILE__
-#   define OPENSSL_LINE __LINE__
-#  endif
-# endif
+#ifndef OPENSSL_FILE
+#ifdef OPENSSL_NO_FILENAMES
+#define OPENSSL_FILE ""
+#define OPENSSL_LINE 0
+#else
+#define OPENSSL_FILE __FILE__
+#define OPENSSL_LINE __LINE__
+#endif
+#endif
 
 /*
  * __func__ was standardized in C99, so for any compiler that claims
@@ -317,33 +316,33 @@
  * If none of the above applies, we check if the compiler is MSVC,
  * and use __FUNCTION__ if that's the case.
  */
-# ifndef OPENSSL_FUNC
-#  if defined(__STDC_VERSION__)
-#   if __STDC_VERSION__ >= 199901L
-#    define OPENSSL_FUNC __func__
-#   elif defined(__GNUC__) && __GNUC__ >= 2
-#    define OPENSSL_FUNC __FUNCTION__
-#   endif
-#  elif defined(_MSC_VER)
-#    define OPENSSL_FUNC __FUNCTION__
-#  endif
+#ifndef OPENSSL_FUNC
+#if defined(__STDC_VERSION__)
+#if __STDC_VERSION__ >= 199901L
+#define OPENSSL_FUNC __func__
+#elif defined(__GNUC__) && __GNUC__ >= 2
+#define OPENSSL_FUNC __FUNCTION__
+#endif
+#elif defined(_MSC_VER)
+#define OPENSSL_FUNC __FUNCTION__
+#endif
 /*
  * If all these possibilities are exhausted, we give up and use a
  * static string.
  */
-#  ifndef OPENSSL_FUNC
-#   define OPENSSL_FUNC "(unknown function)"
-#  endif
-# endif
+#ifndef OPENSSL_FUNC
+#define OPENSSL_FUNC "(unknown function)"
+#endif
+#endif
 
-# ifndef OSSL_CRYPTO_ALLOC
-#  if defined(__GNUC__)
-#   define OSSL_CRYPTO_ALLOC __attribute__((__malloc__))
-#  elif defined(_MSC_VER)
-#   define OSSL_CRYPTO_ALLOC __declspec(restrict)
-#  else
-#   define OSSL_CRYPTO_ALLOC
-#  endif
-# endif
+#ifndef OSSL_CRYPTO_ALLOC
+#if defined(__GNUC__)
+#define OSSL_CRYPTO_ALLOC __attribute__((__malloc__))
+#elif defined(_MSC_VER)
+#define OSSL_CRYPTO_ALLOC __declspec(restrict)
+#else
+#define OSSL_CRYPTO_ALLOC
+#endif
+#endif
 
-#endif  /* OPENSSL_MACROS_H */
+#endif /* OPENSSL_MACROS_H */
diff --git a/include/openssl/md2.h b/include/openssl/md2.h
index 5d4cb77e71cb..10d9a0f21626 100644
--- a/include/openssl/md2.h
+++ b/include/openssl/md2.h
@@ -8,29 +8,29 @@
  */
 
 #ifndef OPENSSL_MD2_H
-# define OPENSSL_MD2_H
-# pragma once
+#define OPENSSL_MD2_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_MD2_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_MD2_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_MD2
-#  include <stddef.h>
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_MD2
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define MD2_DIGEST_LENGTH       16
+#define MD2_DIGEST_LENGTH 16
 
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
 
 typedef unsigned char MD2_INT;
 
-#   define MD2_BLOCK               16
+#define MD2_BLOCK 16
 
 typedef struct MD2state_st {
     unsigned int num;
@@ -38,19 +38,19 @@ typedef struct MD2state_st {
     MD2_INT cksm[MD2_BLOCK];
     MD2_INT state[MD2_BLOCK];
 } MD2_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *MD2_options(void);
 OSSL_DEPRECATEDIN_3_0 int MD2_Init(MD2_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int MD2_Update(MD2_CTX *c, const unsigned char *data,
-                                     size_t len);
+    size_t len);
 OSSL_DEPRECATEDIN_3_0 int MD2_Final(unsigned char *md, MD2_CTX *c);
 OSSL_DEPRECATEDIN_3_0 unsigned char *MD2(const unsigned char *d, size_t n,
-                                         unsigned char *md);
-#  endif
+    unsigned char *md);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 #endif
diff --git a/include/openssl/md4.h b/include/openssl/md4.h
index 6c150a6cb24c..d60fe4a667da 100644
--- a/include/openssl/md4.h
+++ b/include/openssl/md4.h
@@ -8,36 +8,36 @@
  */
 
 #ifndef OPENSSL_MD4_H
-# define OPENSSL_MD4_H
-# pragma once
+#define OPENSSL_MD4_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_MD4_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_MD4_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_MD4
-#  include <openssl/e_os2.h>
-#  include <stddef.h>
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_MD4
+#include <openssl/e_os2.h>
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
-#   endif
+#endif
 
-#  define MD4_DIGEST_LENGTH 16
+#define MD4_DIGEST_LENGTH 16
 
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
 
 /*-
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * ! MD4_LONG has to be at least 32 bits wide.                     !
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
-#   define MD4_LONG unsigned int
+#define MD4_LONG unsigned int
 
-#   define MD4_CBLOCK      64
-#   define MD4_LBLOCK      (MD4_CBLOCK/4)
+#define MD4_CBLOCK 64
+#define MD4_LBLOCK (MD4_CBLOCK / 4)
 
 typedef struct MD4state_st {
     MD4_LONG A, B, C, D;
@@ -45,19 +45,19 @@ typedef struct MD4state_st {
     MD4_LONG data[MD4_LBLOCK];
     unsigned int num;
 } MD4_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int MD4_Init(MD4_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int MD4_Update(MD4_CTX *c, const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int MD4_Final(unsigned char *md, MD4_CTX *c);
 OSSL_DEPRECATEDIN_3_0 unsigned char *MD4(const unsigned char *d, size_t n,
-                                         unsigned char *md);
+    unsigned char *md);
 OSSL_DEPRECATEDIN_3_0 void MD4_Transform(MD4_CTX *c, const unsigned char *b);
-#  endif
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/md5.h b/include/openssl/md5.h
index 77a577340f71..0ec3d1ce956d 100644
--- a/include/openssl/md5.h
+++ b/include/openssl/md5.h
@@ -8,35 +8,35 @@
  */
 
 #ifndef OPENSSL_MD5_H
-# define OPENSSL_MD5_H
-# pragma once
+#define OPENSSL_MD5_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_MD5_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_MD5_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_MD5
-#  include <openssl/e_os2.h>
-#  include <stddef.h>
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_MD5
+#include <openssl/e_os2.h>
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define MD5_DIGEST_LENGTH 16
+#define MD5_DIGEST_LENGTH 16
 
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
 /*
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * ! MD5_LONG has to be at least 32 bits wide.                     !
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
-#   define MD5_LONG unsigned int
+#define MD5_LONG unsigned int
 
-#   define MD5_CBLOCK      64
-#   define MD5_LBLOCK      (MD5_CBLOCK/4)
+#define MD5_CBLOCK 64
+#define MD5_LBLOCK (MD5_CBLOCK / 4)
 
 typedef struct MD5state_st {
     MD5_LONG A, B, C, D;
@@ -44,19 +44,19 @@ typedef struct MD5state_st {
     MD5_LONG data[MD5_LBLOCK];
     unsigned int num;
 } MD5_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int MD5_Init(MD5_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int MD5_Update(MD5_CTX *c, const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int MD5_Final(unsigned char *md, MD5_CTX *c);
 OSSL_DEPRECATEDIN_3_0 unsigned char *MD5(const unsigned char *d, size_t n,
-                                         unsigned char *md);
+    unsigned char *md);
 OSSL_DEPRECATEDIN_3_0 void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-#  endif
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h
index 5a7ee289d1d0..46c96525deee 100644
--- a/include/openssl/mdc2.h
+++ b/include/openssl/mdc2.h
@@ -8,48 +8,48 @@
  */
 
 #ifndef OPENSSL_MDC2_H
-# define OPENSSL_MDC2_H
-# pragma once
+#define OPENSSL_MDC2_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_MDC2_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_MDC2_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_MDC2
-#  include <stdlib.h>
-#  include <openssl/des.h>
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_MDC2
+#include <stdlib.h>
+#include <openssl/des.h>
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define MDC2_DIGEST_LENGTH      16
+#define MDC2_DIGEST_LENGTH 16
 
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
 
-#   define MDC2_BLOCK              8
+#define MDC2_BLOCK 8
 
 typedef struct mdc2_ctx_st {
     unsigned int num;
     unsigned char data[MDC2_BLOCK];
     DES_cblock h, hh;
-    unsigned int pad_type;   /* either 1 or 2, default 1 */
+    unsigned int pad_type; /* either 1 or 2, default 1 */
 } MDC2_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int MDC2_Init(MDC2_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int MDC2_Update(MDC2_CTX *c, const unsigned char *data,
-                                      size_t len);
+    size_t len);
 OSSL_DEPRECATEDIN_3_0 int MDC2_Final(unsigned char *md, MDC2_CTX *c);
 OSSL_DEPRECATEDIN_3_0 unsigned char *MDC2(const unsigned char *d, size_t n,
-                                          unsigned char *md);
-#  endif
+    unsigned char *md);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/ml_kem.h b/include/openssl/ml_kem.h
index 1c9016345820..fe5b0e2b7b89 100644
--- a/include/openssl/ml_kem.h
+++ b/include/openssl/ml_kem.h
@@ -8,24 +8,24 @@
  */
 
 #ifndef OPENSSL_ML_KEM_H
-# define OPENSSL_ML_KEM_H
-# pragma once
+#define OPENSSL_ML_KEM_H
+#pragma once
 
-# define OSSL_ML_KEM_SHARED_SECRET_BYTES    32
+#define OSSL_ML_KEM_SHARED_SECRET_BYTES 32
 
-# define OSSL_ML_KEM_512_BITS               512
-# define OSSL_ML_KEM_512_SECURITY_BITS      128
-# define OSSL_ML_KEM_512_CIPHERTEXT_BYTES   768
-# define OSSL_ML_KEM_512_PUBLIC_KEY_BYTES   800
+#define OSSL_ML_KEM_512_BITS 512
+#define OSSL_ML_KEM_512_SECURITY_BITS 128
+#define OSSL_ML_KEM_512_CIPHERTEXT_BYTES 768
+#define OSSL_ML_KEM_512_PUBLIC_KEY_BYTES 800
 
-# define OSSL_ML_KEM_768_BITS               768
-# define OSSL_ML_KEM_768_SECURITY_BITS      192
-# define OSSL_ML_KEM_768_CIPHERTEXT_BYTES   1088
-# define OSSL_ML_KEM_768_PUBLIC_KEY_BYTES   1184
+#define OSSL_ML_KEM_768_BITS 768
+#define OSSL_ML_KEM_768_SECURITY_BITS 192
+#define OSSL_ML_KEM_768_CIPHERTEXT_BYTES 1088
+#define OSSL_ML_KEM_768_PUBLIC_KEY_BYTES 1184
 
-# define OSSL_ML_KEM_1024_BITS              1024
-# define OSSL_ML_KEM_1024_SECURITY_BITS     256
-# define OSSL_ML_KEM_1024_CIPHERTEXT_BYTES  1568
-# define OSSL_ML_KEM_1024_PUBLIC_KEY_BYTES  1568
+#define OSSL_ML_KEM_1024_BITS 1024
+#define OSSL_ML_KEM_1024_SECURITY_BITS 256
+#define OSSL_ML_KEM_1024_CIPHERTEXT_BYTES 1568
+#define OSSL_ML_KEM_1024_PUBLIC_KEY_BYTES 1568
 
 #endif
diff --git a/include/openssl/modes.h b/include/openssl/modes.h
index e19079912ba2..df11114569f2 100644
--- a/include/openssl/modes.h
+++ b/include/openssl/modes.h
@@ -8,212 +8,212 @@
  */
 
 #ifndef OPENSSL_MODES_H
-# define OPENSSL_MODES_H
-# pragma once
+#define OPENSSL_MODES_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_MODES_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_MODES_H
+#endif
 
-# include <stddef.h>
-# include <openssl/types.h>
+#include <stddef.h>
+#include <openssl/types.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
-typedef void (*block128_f) (const unsigned char in[16],
-                            unsigned char out[16], const void *key);
+#endif
+typedef void (*block128_f)(const unsigned char in[16],
+    unsigned char out[16], const void *key);
 
-typedef void (*cbc128_f) (const unsigned char *in, unsigned char *out,
-                          size_t len, const void *key,
-                          unsigned char ivec[16], int enc);
+typedef void (*cbc128_f)(const unsigned char *in, unsigned char *out,
+    size_t len, const void *key,
+    unsigned char ivec[16], int enc);
 
-typedef void (*ecb128_f) (const unsigned char *in, unsigned char *out,
-                          size_t len, const void *key,
-                          int enc);
+typedef void (*ecb128_f)(const unsigned char *in, unsigned char *out,
+    size_t len, const void *key,
+    int enc);
 
-typedef void (*ctr128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec[16]);
+typedef void (*ctr128_f)(const unsigned char *in, unsigned char *out,
+    size_t blocks, const void *key,
+    const unsigned char ivec[16]);
 
-typedef void (*ccm128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec[16],
-                          unsigned char cmac[16]);
+typedef void (*ccm128_f)(const unsigned char *in, unsigned char *out,
+    size_t blocks, const void *key,
+    const unsigned char ivec[16],
+    unsigned char cmac[16]);
 
 void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], block128_f block);
+    size_t len, const void *key,
+    unsigned char ivec[16], block128_f block);
 void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], block128_f block);
+    size_t len, const void *key,
+    unsigned char ivec[16], block128_f block);
 
 void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16],
-                           unsigned char ecount_buf[16], unsigned int *num,
-                           block128_f block);
+    size_t len, const void *key,
+    unsigned char ivec[16],
+    unsigned char ecount_buf[16], unsigned int *num,
+    block128_f block);
 
 void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16],
-                                 unsigned char ecount_buf[16],
-                                 unsigned int *num, ctr128_f ctr);
+    size_t len, const void *key,
+    unsigned char ivec[16],
+    unsigned char ecount_buf[16],
+    unsigned int *num, ctr128_f ctr);
 
 void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], int *num,
-                           block128_f block);
+    size_t len, const void *key,
+    unsigned char ivec[16], int *num,
+    block128_f block);
 
 void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], int *num,
-                           int enc, block128_f block);
+    size_t len, const void *key,
+    unsigned char ivec[16], int *num,
+    int enc, block128_f block);
 void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const void *key,
-                             unsigned char ivec[16], int *num,
-                             int enc, block128_f block);
+    size_t length, const void *key,
+    unsigned char ivec[16], int *num,
+    int enc, block128_f block);
 void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t bits, const void *key,
-                             unsigned char ivec[16], int *num,
-                             int enc, block128_f block);
+    size_t bits, const void *key,
+    unsigned char ivec[16], int *num,
+    int enc, block128_f block);
 
 size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec[16],
-                                   block128_f block);
+    unsigned char *out, size_t len,
+    const void *key, unsigned char ivec[16],
+    block128_f block);
 size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec[16], cbc128_f cbc);
+    size_t len, const void *key,
+    unsigned char ivec[16], cbc128_f cbc);
 size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec[16],
-                                   block128_f block);
+    unsigned char *out, size_t len,
+    const void *key, unsigned char ivec[16],
+    block128_f block);
 size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec[16], cbc128_f cbc);
+    size_t len, const void *key,
+    unsigned char ivec[16], cbc128_f cbc);
 
 size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec[16],
-                                       block128_f block);
+    unsigned char *out, size_t len,
+    const void *key,
+    unsigned char ivec[16],
+    block128_f block);
 size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16], cbc128_f cbc);
+    size_t len, const void *key,
+    unsigned char ivec[16], cbc128_f cbc);
 size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec[16],
-                                       block128_f block);
+    unsigned char *out, size_t len,
+    const void *key,
+    unsigned char ivec[16],
+    block128_f block);
 size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16], cbc128_f cbc);
+    size_t len, const void *key,
+    unsigned char ivec[16], cbc128_f cbc);
 
 typedef struct gcm128_context GCM128_CONTEXT;
 
 GCM128_CONTEXT *CRYPTO_gcm128_new(void *key, block128_f block);
 void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block);
 void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
-                         size_t len);
+    size_t len);
 int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len);
+    size_t len);
 int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
+    const unsigned char *in, unsigned char *out,
+    size_t len);
 int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
+    const unsigned char *in, unsigned char *out,
+    size_t len);
 int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
+    const unsigned char *in, unsigned char *out,
+    size_t len, ctr128_f stream);
 int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
+    const unsigned char *in, unsigned char *out,
+    size_t len, ctr128_f stream);
 int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len);
+    size_t len);
 void CRYPTO_gcm128_tag(GCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
 void CRYPTO_gcm128_release(GCM128_CONTEXT *ctx);
 
 typedef struct ccm128_context CCM128_CONTEXT;
 
 void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
-                        unsigned int M, unsigned int L, void *key,
-                        block128_f block);
+    unsigned int M, unsigned int L, void *key,
+    block128_f block);
 int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx, const unsigned char *nonce,
-                        size_t nlen, size_t mlen);
+    size_t nlen, size_t mlen);
 void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx, const unsigned char *aad,
-                       size_t alen);
+    size_t alen);
 int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
+    unsigned char *out, size_t len);
 int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
+    unsigned char *out, size_t len);
 int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
+    unsigned char *out, size_t len,
+    ccm128_f stream);
 int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
+    unsigned char *out, size_t len,
+    ccm128_f stream);
 size_t CRYPTO_ccm128_tag(CCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
 
 typedef struct xts128_context XTS128_CONTEXT;
 
 int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
-                          const unsigned char iv[16],
-                          const unsigned char *inp, unsigned char *out,
-                          size_t len, int enc);
+    const unsigned char iv[16],
+    const unsigned char *inp, unsigned char *out,
+    size_t len, int enc);
 
 size_t CRYPTO_128_wrap(void *key, const unsigned char *iv,
-                       unsigned char *out,
-                       const unsigned char *in, size_t inlen,
-                       block128_f block);
+    unsigned char *out,
+    const unsigned char *in, size_t inlen,
+    block128_f block);
 
 size_t CRYPTO_128_unwrap(void *key, const unsigned char *iv,
-                         unsigned char *out,
-                         const unsigned char *in, size_t inlen,
-                         block128_f block);
+    unsigned char *out,
+    const unsigned char *in, size_t inlen,
+    block128_f block);
 size_t CRYPTO_128_wrap_pad(void *key, const unsigned char *icv,
-                           unsigned char *out, const unsigned char *in,
-                           size_t inlen, block128_f block);
+    unsigned char *out, const unsigned char *in,
+    size_t inlen, block128_f block);
 size_t CRYPTO_128_unwrap_pad(void *key, const unsigned char *icv,
-                             unsigned char *out, const unsigned char *in,
-                             size_t inlen, block128_f block);
+    unsigned char *out, const unsigned char *in,
+    size_t inlen, block128_f block);
 
-# ifndef OPENSSL_NO_OCB
+#ifndef OPENSSL_NO_OCB
 typedef struct ocb128_context OCB128_CONTEXT;
 
-typedef void (*ocb128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          size_t start_block_num,
-                          unsigned char offset_i[16],
-                          const unsigned char L_[][16],
-                          unsigned char checksum[16]);
+typedef void (*ocb128_f)(const unsigned char *in, unsigned char *out,
+    size_t blocks, const void *key,
+    size_t start_block_num,
+    unsigned char offset_i[16],
+    const unsigned char L_[][16],
+    unsigned char checksum[16]);
 
 OCB128_CONTEXT *CRYPTO_ocb128_new(void *keyenc, void *keydec,
-                                  block128_f encrypt, block128_f decrypt,
-                                  ocb128_f stream);
+    block128_f encrypt, block128_f decrypt,
+    ocb128_f stream);
 int CRYPTO_ocb128_init(OCB128_CONTEXT *ctx, void *keyenc, void *keydec,
-                       block128_f encrypt, block128_f decrypt,
-                       ocb128_f stream);
+    block128_f encrypt, block128_f decrypt,
+    ocb128_f stream);
 int CRYPTO_ocb128_copy_ctx(OCB128_CONTEXT *dest, OCB128_CONTEXT *src,
-                           void *keyenc, void *keydec);
+    void *keyenc, void *keydec);
 int CRYPTO_ocb128_setiv(OCB128_CONTEXT *ctx, const unsigned char *iv,
-                        size_t len, size_t taglen);
+    size_t len, size_t taglen);
 int CRYPTO_ocb128_aad(OCB128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len);
+    size_t len);
 int CRYPTO_ocb128_encrypt(OCB128_CONTEXT *ctx, const unsigned char *in,
-                          unsigned char *out, size_t len);
+    unsigned char *out, size_t len);
 int CRYPTO_ocb128_decrypt(OCB128_CONTEXT *ctx, const unsigned char *in,
-                          unsigned char *out, size_t len);
+    unsigned char *out, size_t len);
 int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len);
+    size_t len);
 int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len);
 void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx);
-# endif                          /* OPENSSL_NO_OCB */
+#endif /* OPENSSL_NO_OCB */
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index ee71e26458ff..bbce70f3652c 100644
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -6591,46 +6591,46 @@
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 
-#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm                 SN_magma_ctr_acpkm
-#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm                NID_magma_ctr_acpkm
-#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm                OBJ_magma_ctr_acpkm
+#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm SN_magma_ctr_acpkm
+#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm NID_magma_ctr_acpkm
+#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm OBJ_magma_ctr_acpkm
 
-#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac            SN_magma_ctr_acpkm_omac
-#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac           NID_magma_ctr_acpkm_omac
-#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac           OBJ_magma_ctr_acpkm_omac
+#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac SN_magma_ctr_acpkm_omac
+#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac NID_magma_ctr_acpkm_omac
+#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac OBJ_magma_ctr_acpkm_omac
 
-#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm            SN_kuznyechik_ctr_acpkm
-#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm           NID_kuznyechik_ctr_acpkm
-#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm           OBJ_kuznyechik_ctr_acpkm
+#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm SN_kuznyechik_ctr_acpkm
+#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm NID_kuznyechik_ctr_acpkm
+#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm OBJ_kuznyechik_ctr_acpkm
 
-#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac               SN_kuznyechik_ctr_acpkm_omac
-#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac              NID_kuznyechik_ctr_acpkm_omac
-#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac              OBJ_kuznyechik_ctr_acpkm_omac
+#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac SN_kuznyechik_ctr_acpkm_omac
+#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac NID_kuznyechik_ctr_acpkm_omac
+#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac OBJ_kuznyechik_ctr_acpkm_omac
 
-#define SN_id_tc26_wrap_gostr3412_2015_magma_kexp15             SN_magma_kexp15
-#define NID_id_tc26_wrap_gostr3412_2015_magma_kexp15            NID_magma_kexp15
-#define OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15            OBJ_magma_kexp15
+#define SN_id_tc26_wrap_gostr3412_2015_magma_kexp15 SN_magma_kexp15
+#define NID_id_tc26_wrap_gostr3412_2015_magma_kexp15 NID_magma_kexp15
+#define OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 OBJ_magma_kexp15
 
-#define SN_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15                SN_kuznyechik_kexp15
-#define NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15               NID_kuznyechik_kexp15
-#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15               OBJ_kuznyechik_kexp15
+#define SN_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 SN_kuznyechik_kexp15
+#define NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 NID_kuznyechik_kexp15
+#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 OBJ_kuznyechik_kexp15
 
-#define SN_grasshopper_ecb              SN_kuznyechik_ecb
-#define NID_grasshopper_ecb             NID_kuznyechik_ecb
+#define SN_grasshopper_ecb SN_kuznyechik_ecb
+#define NID_grasshopper_ecb NID_kuznyechik_ecb
 
-#define SN_grasshopper_ctr              SN_kuznyechik_ctr
-#define NID_grasshopper_ctr             NID_kuznyechik_ctr
+#define SN_grasshopper_ctr SN_kuznyechik_ctr
+#define NID_grasshopper_ctr NID_kuznyechik_ctr
 
-#define SN_grasshopper_ofb              SN_kuznyechik_ofb
-#define NID_grasshopper_ofb             NID_kuznyechik_ofb
+#define SN_grasshopper_ofb SN_kuznyechik_ofb
+#define NID_grasshopper_ofb NID_kuznyechik_ofb
 
-#define SN_grasshopper_cbc              SN_kuznyechik_cbc
-#define NID_grasshopper_cbc             NID_kuznyechik_cbc
+#define SN_grasshopper_cbc SN_kuznyechik_cbc
+#define NID_grasshopper_cbc NID_kuznyechik_cbc
 
-#define SN_grasshopper_cfb              SN_kuznyechik_cfb
-#define NID_grasshopper_cfb             NID_kuznyechik_cfb
+#define SN_grasshopper_cfb SN_kuznyechik_cfb
+#define NID_grasshopper_cfb NID_kuznyechik_cfb
 
-#define SN_grasshopper_mac              SN_kuznyechik_mac
-#define NID_grasshopper_mac             NID_kuznyechik_mac
+#define SN_grasshopper_mac SN_kuznyechik_mac
+#define NID_grasshopper_mac NID_kuznyechik_mac
 
-#endif  /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
diff --git a/include/openssl/objects.h b/include/openssl/objects.h
index cc9f3c51b059..de1f1db97d6d 100644
--- a/include/openssl/objects.h
+++ b/include/openssl/objects.h
@@ -8,35 +8,34 @@
  */
 
 #ifndef OPENSSL_OBJECTS_H
-# define OPENSSL_OBJECTS_H
-# pragma once
+#define OPENSSL_OBJECTS_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OBJECTS_H
-# endif
-
-# include <openssl/obj_mac.h>
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/objectserr.h>
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_OBJECTS_H
+#endif
 
-# define OBJ_NAME_TYPE_UNDEF             0x00
-# define OBJ_NAME_TYPE_MD_METH           0x01
-# define OBJ_NAME_TYPE_CIPHER_METH       0x02
-# define OBJ_NAME_TYPE_PKEY_METH         0x03
-# define OBJ_NAME_TYPE_COMP_METH         0x04
-# define OBJ_NAME_TYPE_MAC_METH          0x05
-# define OBJ_NAME_TYPE_KDF_METH          0x06
-# define OBJ_NAME_TYPE_NUM               0x07
+#include <openssl/obj_mac.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/objectserr.h>
 
-# define OBJ_NAME_ALIAS                  0x8000
+#define OBJ_NAME_TYPE_UNDEF 0x00
+#define OBJ_NAME_TYPE_MD_METH 0x01
+#define OBJ_NAME_TYPE_CIPHER_METH 0x02
+#define OBJ_NAME_TYPE_PKEY_METH 0x03
+#define OBJ_NAME_TYPE_COMP_METH 0x04
+#define OBJ_NAME_TYPE_MAC_METH 0x05
+#define OBJ_NAME_TYPE_KDF_METH 0x06
+#define OBJ_NAME_TYPE_NUM 0x07
 
-# define OBJ_BSEARCH_VALUE_ON_NOMATCH            0x01
-# define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH        0x02
+#define OBJ_NAME_ALIAS 0x8000
 
+#define OBJ_BSEARCH_VALUE_ON_NOMATCH 0x01
+#define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH 0x02
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -47,21 +46,21 @@ typedef struct obj_name_st {
     const char *data;
 } OBJ_NAME;
 
-# define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
+#define OBJ_create_and_add_object(a, b, c) OBJ_create(a, b, c)
 
 int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
-                       int (*cmp_func) (const char *, const char *),
-                       void (*free_func) (const char *, int, const char *));
+int OBJ_NAME_new_index(unsigned long (*hash_func)(const char *),
+    int (*cmp_func)(const char *, const char *),
+    void (*free_func)(const char *, int, const char *));
 const char *OBJ_NAME_get(const char *name, int type);
 int OBJ_NAME_add(const char *name, int type, const char *data);
 int OBJ_NAME_remove(const char *name, int type);
 void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg),
-                     void *arg);
+void OBJ_NAME_do_all(int type, void (*fn)(const OBJ_NAME *, void *arg),
+    void *arg);
 void OBJ_NAME_do_all_sorted(int type,
-                            void (*fn) (const OBJ_NAME *, void *arg),
-                            void *arg);
+    void (*fn)(const OBJ_NAME *, void *arg),
+    void *arg);
 
 DECLARE_ASN1_DUP_FUNCTION_name(ASN1_OBJECT, OBJ)
 ASN1_OBJECT *OBJ_nid2obj(int n);
@@ -75,21 +74,21 @@ int OBJ_ln2nid(const char *s);
 int OBJ_sn2nid(const char *s);
 int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
 const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
-                         int (*cmp) (const void *, const void *));
+    int (*cmp)(const void *, const void *));
 const void *OBJ_bsearch_ex_(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);
 
-# define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm)    \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
-  static int nm##_cmp(type1 const *, type2 const *); \
-  scope type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
+#define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm)        \
+    static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
+    static int nm##_cmp(type1 const *, type2 const *);              \
+    scope type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
 
-# define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp)   \
-  _DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
-# define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)     \
-  type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
+#define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp) \
+    _DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
+#define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm) \
+    type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
 
 /*-
  * Unsolved problem: if a type is actually a pointer type, like
@@ -118,53 +117,56 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
  * comparison routines do always not touch their arguments.
  */
 
-# define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm)  \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  static type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
+#define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm)                     \
+    static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)     \
+    {                                                                      \
+        type1 const *a = a_;                                               \
+        type2 const *b = b_;                                               \
+        return nm##_cmp(a, b);                                             \
+    }                                                                      \
+    static type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
+    {                                                                      \
+        return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2),        \
+            nm##_cmp_BSEARCH_CMP_FN);                                      \
+    }                                                                      \
+    extern void dummy_prototype(void)
 
-# define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)   \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
+#define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)          \
+    static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_) \
+    {                                                                  \
+        type1 const *a = a_;                                           \
+        type2 const *b = b_;                                           \
+        return nm##_cmp(a, b);                                         \
+    }                                                                  \
+    type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)    \
+    {                                                                  \
+        return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2),    \
+            nm##_cmp_BSEARCH_CMP_FN);                                  \
+    }                                                                  \
+    extern void dummy_prototype(void)
 
-# define OBJ_bsearch(type1,key,type2,base,num,cmp)                              \
-  ((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)CHECKED_PTR_OF(type2,cmp##_type_2),     \
-                          cmp##_BSEARCH_CMP_FN)))
+#define OBJ_bsearch(type1, key, type2, base, num, cmp)                              \
+    ((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1, key), CHECKED_PTR_OF(type2, base), \
+        num, sizeof(type2),                                                         \
+        ((void)CHECKED_PTR_OF(type1, cmp##_type_1),                                 \
+            (void)CHECKED_PTR_OF(type2, cmp##_type_2),                              \
+            cmp##_BSEARCH_CMP_FN)))
 
-# define OBJ_bsearch_ex(type1,key,type2,base,num,cmp,flags)                      \
-  ((type2 *)OBJ_bsearch_ex_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
-                          cmp##_BSEARCH_CMP_FN)),flags)
+#define OBJ_bsearch_ex(type1, key, type2, base, num, cmp, flags)                       \
+    ((type2 *)OBJ_bsearch_ex_(CHECKED_PTR_OF(type1, key), CHECKED_PTR_OF(type2, base), \
+         num, sizeof(type2),                                                           \
+         ((void)CHECKED_PTR_OF(type1, cmp##_type_1),                                   \
+             (void)type_2 = CHECKED_PTR_OF(type2, cmp##_type_2),                       \
+             cmp##_BSEARCH_CMP_FN)),                                                   \
+        flags)
 
 int OBJ_new_nid(int num);
 int OBJ_add_object(const ASN1_OBJECT *obj);
 int OBJ_create(const char *oid, const char *sn, const char *ln);
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# define OBJ_cleanup() while(0) continue
+#define OBJ_cleanup() \
+    while (0)         \
+    continue
 #endif
 int OBJ_create_objects(BIO *in);
 
@@ -178,7 +180,7 @@ void OBJ_sigid_free(void);
 
 #define SN_ac_auditEntity SN_ac_auditIdentity
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h
index 585217f6f7d1..2927561135f2 100644
--- a/include/openssl/objectserr.h
+++ b/include/openssl/objectserr.h
@@ -9,20 +9,18 @@
  */
 
 #ifndef OPENSSL_OBJECTSERR_H
-# define OPENSSL_OBJECTSERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_OBJECTSERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * OBJ reason codes.
  */
-# define OBJ_R_OID_EXISTS                                 102
-# define OBJ_R_UNKNOWN_NID                                101
-# define OBJ_R_UNKNOWN_OBJECT_NAME                        103
+#define OBJ_R_OID_EXISTS 102
+#define OBJ_R_UNKNOWN_NID 101
+#define OBJ_R_UNKNOWN_OBJECT_NAME 103
 
 #endif
diff --git a/include/openssl/ocsp.h.in b/include/openssl/ocsp.h.in
index e2cc2716b56b..d2cfd9c1163b 100644
--- a/include/openssl/ocsp.h.in
+++ b/include/openssl/ocsp.h.in
@@ -9,22 +9,24 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_OCSP_H
-# define OPENSSL_OCSP_H
-# pragma once
+#define OPENSSL_OCSP_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OCSP_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_OCSP_H
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/http.h>
-# include <openssl/asn1.h>
+#include <openssl/opensslconf.h>
+#include <openssl/http.h>
+#include <openssl/asn1.h>
 
 /*
  * These definitions are outside the OPENSSL_NO_OCSP guard because although for
@@ -45,47 +47,46 @@ use OpenSSL::stackhash qw(generate_stack_macros);
  *        privilegeWithdrawn      (9),
  *        aACompromise           (10) }
  */
-# define OCSP_REVOKED_STATUS_NOSTATUS                -1
-# define OCSP_REVOKED_STATUS_UNSPECIFIED             0
-# define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1
-# define OCSP_REVOKED_STATUS_CACOMPROMISE            2
-# define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3
-# define OCSP_REVOKED_STATUS_SUPERSEDED              4
-# define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5
-# define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6
-# define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8
-# define OCSP_REVOKED_STATUS_PRIVILEGEWITHDRAWN      9
-# define OCSP_REVOKED_STATUS_AACOMPROMISE            10
-
+#define OCSP_REVOKED_STATUS_NOSTATUS -1
+#define OCSP_REVOKED_STATUS_UNSPECIFIED 0
+#define OCSP_REVOKED_STATUS_KEYCOMPROMISE 1
+#define OCSP_REVOKED_STATUS_CACOMPROMISE 2
+#define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED 3
+#define OCSP_REVOKED_STATUS_SUPERSEDED 4
+#define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION 5
+#define OCSP_REVOKED_STATUS_CERTIFICATEHOLD 6
+#define OCSP_REVOKED_STATUS_REMOVEFROMCRL 8
+#define OCSP_REVOKED_STATUS_PRIVILEGEWITHDRAWN 9
+#define OCSP_REVOKED_STATUS_AACOMPROMISE 10
 
-# ifndef OPENSSL_NO_OCSP
+#ifndef OPENSSL_NO_OCSP
 
-#  include <openssl/x509.h>
-#  include <openssl/x509v3.h>
-#  include <openssl/safestack.h>
-#  include <openssl/ocsperr.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/safestack.h>
+#include <openssl/ocsperr.h>
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
 /* Various flags and values */
 
-#  define OCSP_DEFAULT_NONCE_LENGTH       16
+#define OCSP_DEFAULT_NONCE_LENGTH 16
 
-#  define OCSP_NOCERTS                    0x1
-#  define OCSP_NOINTERN                   0x2
-#  define OCSP_NOSIGS                     0x4
-#  define OCSP_NOCHAIN                    0x8
-#  define OCSP_NOVERIFY                   0x10
-#  define OCSP_NOEXPLICIT                 0x20
-#  define OCSP_NOCASIGN                   0x40
-#  define OCSP_NODELEGATED                0x80
-#  define OCSP_NOCHECKS                   0x100
-#  define OCSP_TRUSTOTHER                 0x200
-#  define OCSP_RESPID_KEY                 0x400
-#  define OCSP_NOTIME                     0x800
-#  define OCSP_PARTIAL_CHAIN              0x1000
+#define OCSP_NOCERTS 0x1
+#define OCSP_NOINTERN 0x2
+#define OCSP_NOSIGS 0x4
+#define OCSP_NOCHAIN 0x8
+#define OCSP_NOVERIFY 0x10
+#define OCSP_NOEXPLICIT 0x20
+#define OCSP_NOCASIGN 0x40
+#define OCSP_NODELEGATED 0x80
+#define OCSP_NOCHECKS 0x100
+#define OCSP_TRUSTOTHER 0x200
+#define OCSP_RESPID_KEY 0x400
+#define OCSP_NOTIME 0x800
+#define OCSP_PARTIAL_CHAIN 0x1000
 
 typedef struct ocsp_cert_id_st OCSP_CERTID;
 typedef struct ocsp_one_request_st OCSP_ONEREQ;
@@ -93,39 +94,45 @@ typedef struct ocsp_req_info_st OCSP_REQINFO;
 typedef struct ocsp_signature_st OCSP_SIGNATURE;
 typedef struct ocsp_request_st OCSP_REQUEST;
 
+/* clang-format off */
 {-
     generate_stack_macros("OCSP_CERTID")
     .generate_stack_macros("OCSP_ONEREQ");
 -}
+/* clang-format on */
 
-#  define OCSP_RESPONSE_STATUS_SUCCESSFUL           0
-#  define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST     1
-#  define OCSP_RESPONSE_STATUS_INTERNALERROR        2
-#  define OCSP_RESPONSE_STATUS_TRYLATER             3
-#  define OCSP_RESPONSE_STATUS_SIGREQUIRED          5
-#  define OCSP_RESPONSE_STATUS_UNAUTHORIZED         6
+#define OCSP_RESPONSE_STATUS_SUCCESSFUL 0
+#define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST 1
+#define OCSP_RESPONSE_STATUS_INTERNALERROR 2
+#define OCSP_RESPONSE_STATUS_TRYLATER 3
+#define OCSP_RESPONSE_STATUS_SIGREQUIRED 5
+#define OCSP_RESPONSE_STATUS_UNAUTHORIZED 6
 
 typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES;
 
-#  define V_OCSP_RESPID_NAME 0
-#  define V_OCSP_RESPID_KEY  1
+#define V_OCSP_RESPID_NAME 0
+#define V_OCSP_RESPID_KEY 1
 
+/* clang-format off */
 {-
     generate_stack_macros("OCSP_RESPID");
 -}
+/* clang-format on */
 
 typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
 
-#  define V_OCSP_CERTSTATUS_GOOD    0
-#  define V_OCSP_CERTSTATUS_REVOKED 1
-#  define V_OCSP_CERTSTATUS_UNKNOWN 2
+#define V_OCSP_CERTSTATUS_GOOD 0
+#define V_OCSP_CERTSTATUS_REVOKED 1
+#define V_OCSP_CERTSTATUS_UNKNOWN 2
 
 typedef struct ocsp_cert_status_st OCSP_CERTSTATUS;
 typedef struct ocsp_single_response_st OCSP_SINGLERESP;
 
+/* clang-format off */
 {-
     generate_stack_macros("OCSP_SINGLERESP");
 -}
+/* clang-format on */
 
 typedef struct ocsp_response_data_st OCSP_RESPDATA;
 
@@ -134,76 +141,74 @@ typedef struct ocsp_basic_response_st OCSP_BASICRESP;
 typedef struct ocsp_crl_id_st OCSP_CRLID;
 typedef struct ocsp_service_locator_st OCSP_SERVICELOC;
 
-#  define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
-#  define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
+#define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
+#define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
 
-#  define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
+#define d2i_OCSP_REQUEST_bio(bp, p) ASN1_d2i_bio_of(OCSP_REQUEST, OCSP_REQUEST_new, d2i_OCSP_REQUEST, bp, p)
 
-#  define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
+#define d2i_OCSP_RESPONSE_bio(bp, p) ASN1_d2i_bio_of(OCSP_RESPONSE, OCSP_RESPONSE_new, d2i_OCSP_RESPONSE, bp, p)
 
-#  define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
-     (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST, \
-     bp,(char **)(x),cb,NULL)
+#define PEM_read_bio_OCSP_REQUEST(bp, x, cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
+    (d2i_of_void *)d2i_OCSP_REQUEST, PEM_STRING_OCSP_REQUEST,                   \
+    bp, (char **)(x), cb, NULL)
 
-#  define PEM_read_bio_OCSP_RESPONSE(bp,x,cb) (OCSP_RESPONSE *)PEM_ASN1_read_bio(\
-     (char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE, \
-     bp,(char **)(x),cb,NULL)
+#define PEM_read_bio_OCSP_RESPONSE(bp, x, cb) (OCSP_RESPONSE *)PEM_ASN1_read_bio( \
+    (d2i_of_void *)d2i_OCSP_RESPONSE, PEM_STRING_OCSP_RESPONSE,                   \
+    bp, (char **)(x), cb, NULL)
 
-#  define PEM_write_bio_OCSP_REQUEST(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\
-                        bp,(char *)(o), NULL,NULL,0,NULL,NULL)
+#define PEM_write_bio_OCSP_REQUEST(bp, o)                                        \
+    PEM_ASN1_write_bio((i2d_of_void *)i2d_OCSP_REQUEST, PEM_STRING_OCSP_REQUEST, \
+        bp, (char *)(o), NULL, NULL, 0, NULL, NULL)
 
-#  define PEM_write_bio_OCSP_RESPONSE(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
-                        bp,(char *)(o), NULL,NULL,0,NULL,NULL)
+#define PEM_write_bio_OCSP_RESPONSE(bp, o)                                         \
+    PEM_ASN1_write_bio((i2d_of_void *)i2d_OCSP_RESPONSE, PEM_STRING_OCSP_RESPONSE, \
+        bp, (char *)(o), NULL, NULL, 0, NULL, NULL)
 
-#  define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
+#define i2d_OCSP_RESPONSE_bio(bp, o) ASN1_i2d_bio_of(OCSP_RESPONSE, i2d_OCSP_RESPONSE, bp, o)
 
-#  define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
+#define i2d_OCSP_REQUEST_bio(bp, o) ASN1_i2d_bio_of(OCSP_REQUEST, i2d_OCSP_REQUEST, bp, o)
 
-#  define ASN1_BIT_STRING_digest(data,type,md,len) \
-        ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
+#define ASN1_BIT_STRING_digest(data, type, md, len) \
+    ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING), type, data, md, len)
 
-#  define OCSP_CERTSTATUS_dup(cs)\
-                (OCSP_CERTSTATUS*)ASN1_dup((i2d_of_void *)i2d_OCSP_CERTSTATUS,\
-                (d2i_of_void *)d2i_OCSP_CERTSTATUS,(char *)(cs))
+#define OCSP_CERTSTATUS_dup(cs)                                     \
+    (OCSP_CERTSTATUS *)ASN1_dup((i2d_of_void *)i2d_OCSP_CERTSTATUS, \
+        (d2i_of_void *)d2i_OCSP_CERTSTATUS, (char *)(cs))
 
 DECLARE_ASN1_DUP_FUNCTION(OCSP_CERTID)
 
 OSSL_HTTP_REQ_CTX *OCSP_sendreq_new(BIO *io, const char *path,
-                                    const OCSP_REQUEST *req, int buf_size);
+    const OCSP_REQUEST *req, int buf_size);
 OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, const char *path, OCSP_REQUEST *req);
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef OSSL_HTTP_REQ_CTX OCSP_REQ_CTX;
-#   define OCSP_REQ_CTX_new(io, buf_size) \
-        OSSL_HTTP_REQ_CTX_new(io, io, buf_size)
-#   define OCSP_REQ_CTX_free OSSL_HTTP_REQ_CTX_free
-#   define OCSP_REQ_CTX_http(rctx, op, path) \
-        (OSSL_HTTP_REQ_CTX_set_expected(rctx, NULL, 1 /* asn1 */, 0, 0) && \
-         OSSL_HTTP_REQ_CTX_set_request_line(rctx, strcmp(op, "POST") == 0, \
-                                            NULL, NULL, path))
-#   define OCSP_REQ_CTX_add1_header OSSL_HTTP_REQ_CTX_add1_header
-#   define OCSP_REQ_CTX_i2d(r, it, req) \
-        OSSL_HTTP_REQ_CTX_set1_req(r, "application/ocsp-request", it, req)
-#   define OCSP_REQ_CTX_set1_req(r, req) \
-        OCSP_REQ_CTX_i2d(r, ASN1_ITEM_rptr(OCSP_REQUEST), (ASN1_VALUE *)(req))
-#   define OCSP_REQ_CTX_nbio OSSL_HTTP_REQ_CTX_nbio
-#   define OCSP_REQ_CTX_nbio_d2i OSSL_HTTP_REQ_CTX_nbio_d2i
-#   define OCSP_sendreq_nbio(p, r) \
-        OSSL_HTTP_REQ_CTX_nbio_d2i(r, (ASN1_VALUE **)(p), \
-                                   ASN1_ITEM_rptr(OCSP_RESPONSE))
-#   define OCSP_REQ_CTX_get0_mem_bio OSSL_HTTP_REQ_CTX_get0_mem_bio
-#   define OCSP_set_max_response_length OSSL_HTTP_REQ_CTX_set_max_response_length
-#  endif
+#define OCSP_REQ_CTX_new(io, buf_size) \
+    OSSL_HTTP_REQ_CTX_new(io, io, buf_size)
+#define OCSP_REQ_CTX_free OSSL_HTTP_REQ_CTX_free
+#define OCSP_REQ_CTX_http(rctx, op, path) \
+    (OSSL_HTTP_REQ_CTX_set_expected(rctx, NULL, 1 /* asn1 */, 0, 0) && OSSL_HTTP_REQ_CTX_set_request_line(rctx, strcmp(op, "POST") == 0, NULL, NULL, path))
+#define OCSP_REQ_CTX_add1_header OSSL_HTTP_REQ_CTX_add1_header
+#define OCSP_REQ_CTX_i2d(r, it, req) \
+    OSSL_HTTP_REQ_CTX_set1_req(r, "application/ocsp-request", it, req)
+#define OCSP_REQ_CTX_set1_req(r, req) \
+    OCSP_REQ_CTX_i2d(r, ASN1_ITEM_rptr(OCSP_REQUEST), (ASN1_VALUE *)(req))
+#define OCSP_REQ_CTX_nbio OSSL_HTTP_REQ_CTX_nbio
+#define OCSP_REQ_CTX_nbio_d2i OSSL_HTTP_REQ_CTX_nbio_d2i
+#define OCSP_sendreq_nbio(p, r)                       \
+    OSSL_HTTP_REQ_CTX_nbio_d2i(r, (ASN1_VALUE **)(p), \
+        ASN1_ITEM_rptr(OCSP_RESPONSE))
+#define OCSP_REQ_CTX_get0_mem_bio OSSL_HTTP_REQ_CTX_get0_mem_bio
+#define OCSP_set_max_response_length OSSL_HTTP_REQ_CTX_set_max_response_length
+#endif
 
 OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, const X509 *subject,
-                             const X509 *issuer);
+    const X509 *issuer);
 
 OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
-                              const X509_NAME *issuerName,
-                              const ASN1_BIT_STRING *issuerKey,
-                              const ASN1_INTEGER *serialNumber);
+    const X509_NAME *issuerName,
+    const ASN1_BIT_STRING *issuerKey,
+    const ASN1_INTEGER *serialNumber);
 
 OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
 
@@ -216,10 +221,10 @@ int OCSP_request_set1_name(OCSP_REQUEST *req, const X509_NAME *nm);
 int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert);
 
 int OCSP_request_sign(OCSP_REQUEST *req,
-                      X509 *signer,
-                      EVP_PKEY *key,
-                      const EVP_MD *dgst,
-                      STACK_OF(X509) *certs, unsigned long flags);
+    X509 *signer,
+    EVP_PKEY *key,
+    const EVP_MD *dgst,
+    STACK_OF(X509) *certs, unsigned long flags);
 
 int OCSP_response_status(OCSP_RESPONSE *resp);
 OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
@@ -228,36 +233,36 @@ const ASN1_OCTET_STRING *OCSP_resp_get0_signature(const OCSP_BASICRESP *bs);
 const X509_ALGOR *OCSP_resp_get0_tbs_sigalg(const OCSP_BASICRESP *bs);
 const OCSP_RESPDATA *OCSP_resp_get0_respdata(const OCSP_BASICRESP *bs);
 int OCSP_resp_get0_signer(OCSP_BASICRESP *bs, X509 **signer,
-                          STACK_OF(X509) *extra_certs);
+    STACK_OF(X509) *extra_certs);
 
 int OCSP_resp_count(OCSP_BASICRESP *bs);
 OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
-const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(const OCSP_BASICRESP* bs);
+const ASN1_GENERALIZEDTIME *OCSP_resp_get0_produced_at(const OCSP_BASICRESP *bs);
 const STACK_OF(X509) *OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
 int OCSP_resp_get0_id(const OCSP_BASICRESP *bs,
-                      const ASN1_OCTET_STRING **pid,
-                      const X509_NAME **pname);
+    const ASN1_OCTET_STRING **pid,
+    const X509_NAME **pname);
 int OCSP_resp_get1_id(const OCSP_BASICRESP *bs,
-                      ASN1_OCTET_STRING **pid,
-                      X509_NAME **pname);
+    ASN1_OCTET_STRING **pid,
+    X509_NAME **pname);
 
 int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
 int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
-                            ASN1_GENERALIZEDTIME **revtime,
-                            ASN1_GENERALIZEDTIME **thisupd,
-                            ASN1_GENERALIZEDTIME **nextupd);
+    ASN1_GENERALIZEDTIME **revtime,
+    ASN1_GENERALIZEDTIME **thisupd,
+    ASN1_GENERALIZEDTIME **nextupd);
 int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
-                          int *reason,
-                          ASN1_GENERALIZEDTIME **revtime,
-                          ASN1_GENERALIZEDTIME **thisupd,
-                          ASN1_GENERALIZEDTIME **nextupd);
+    int *reason,
+    ASN1_GENERALIZEDTIME **revtime,
+    ASN1_GENERALIZEDTIME **thisupd,
+    ASN1_GENERALIZEDTIME **nextupd);
 int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
-                        ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec);
+    ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec);
 
 int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
-                        X509_STORE *store, unsigned long flags);
+    X509_STORE *store, unsigned long flags);
 
-#  define OCSP_parse_url(url, host, port, path, ssl) \
+#define OCSP_parse_url(url, host, port, path, ssl) \
     OSSL_HTTP_parse_url(url, ssl, NULL, host, port, NULL, path, NULL, NULL)
 
 int OCSP_id_issuer_cmp(const OCSP_CERTID *a, const OCSP_CERTID *b);
@@ -267,29 +272,29 @@ int OCSP_request_onereq_count(OCSP_REQUEST *req);
 OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
 OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one);
 int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
-                      ASN1_OCTET_STRING **pikeyHash,
-                      ASN1_INTEGER **pserial, OCSP_CERTID *cid);
+    ASN1_OCTET_STRING **pikeyHash,
+    ASN1_INTEGER **pserial, OCSP_CERTID *cid);
 int OCSP_request_is_signed(OCSP_REQUEST *req);
 OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
 OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
-                                        OCSP_CERTID *cid,
-                                        int status, int reason,
-                                        ASN1_TIME *revtime,
-                                        ASN1_TIME *thisupd,
-                                        ASN1_TIME *nextupd);
+    OCSP_CERTID *cid,
+    int status, int reason,
+    ASN1_TIME *revtime,
+    ASN1_TIME *thisupd,
+    ASN1_TIME *nextupd);
 int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
 int OCSP_basic_sign(OCSP_BASICRESP *brsp,
-                    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
-                    STACK_OF(X509) *certs, unsigned long flags);
+    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
+    STACK_OF(X509) *certs, unsigned long flags);
 int OCSP_basic_sign_ctx(OCSP_BASICRESP *brsp,
-                        X509 *signer, EVP_MD_CTX *ctx,
-                        STACK_OF(X509) *certs, unsigned long flags);
+    X509 *signer, EVP_MD_CTX *ctx,
+    STACK_OF(X509) *certs, unsigned long flags);
 int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
 int OCSP_RESPID_set_by_key_ex(OCSP_RESPID *respid, X509 *cert,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
 int OCSP_RESPID_match_ex(OCSP_RESPID *respid, X509 *cert, OSSL_LIB_CTX *libctx,
-                         const char *propq);
+    const char *propq);
 int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
 
 X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);
@@ -303,14 +308,14 @@ X509_EXTENSION *OCSP_url_svcloc_new(const X509_NAME *issuer, const char **urls);
 int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);
 int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);
 int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, const ASN1_OBJECT *obj,
-                                int lastpos);
+    int lastpos);
 int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos);
 X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc);
 X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc);
 void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit,
-                                int *idx);
+    int *idx);
 int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-                              unsigned long flags);
+    unsigned long flags);
 int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc);
 
 int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
@@ -321,35 +326,35 @@ X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc);
 X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc);
 void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx);
 int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
-                             unsigned long flags);
+    unsigned long flags);
 int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc);
 
 int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
 int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos);
 int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, const ASN1_OBJECT *obj,
-                                  int lastpos);
+    int lastpos);
 int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,
-                                       int lastpos);
+    int lastpos);
 X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc);
 X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc);
 void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit,
-                                  int *idx);
+    int *idx);
 int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,
-                                int crit, unsigned long flags);
+    int crit, unsigned long flags);
 int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc);
 
 int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
 int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos);
 int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, const ASN1_OBJECT *obj,
-                                   int lastpos);
+    int lastpos);
 int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
-                                        int lastpos);
+    int lastpos);
 X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc);
 X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc);
 void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit,
-                                   int *idx);
+    int *idx);
 int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value,
-                                 int crit, unsigned long flags);
+    int crit, unsigned long flags);
 int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc);
 const OCSP_CERTID *OCSP_SINGLERESP_get0_id(const OCSP_SINGLERESP *x);
 
@@ -377,11 +382,10 @@ int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *a, unsigned long flags);
 int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags);
 
 int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
-                      X509_STORE *st, unsigned long flags);
-
+    X509_STORE *st, unsigned long flags);
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif /* !defined(OPENSSL_NO_OCSP) */
+#endif
+#endif /* !defined(OPENSSL_NO_OCSP) */
 #endif
diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h
index 46a0523c2de4..18e035e8a4e1 100644
--- a/include/openssl/ocsperr.h
+++ b/include/openssl/ocsperr.h
@@ -9,45 +9,43 @@
  */
 
 #ifndef OPENSSL_OCSPERR_H
-# define OPENSSL_OCSPERR_H
-# pragma once
+#define OPENSSL_OCSPERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_OCSP
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_OCSP
 
 /*
  * OCSP reason codes.
  */
-#  define OCSP_R_CERTIFICATE_VERIFY_ERROR                  101
-#  define OCSP_R_DIGEST_ERR                                102
-#  define OCSP_R_DIGEST_NAME_ERR                           106
-#  define OCSP_R_DIGEST_SIZE_ERR                           107
-#  define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD                 122
-#  define OCSP_R_ERROR_IN_THISUPDATE_FIELD                 123
-#  define OCSP_R_MISSING_OCSPSIGNING_USAGE                 103
-#  define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE              124
-#  define OCSP_R_NOT_BASIC_RESPONSE                        104
-#  define OCSP_R_NO_CERTIFICATES_IN_CHAIN                  105
-#  define OCSP_R_NO_RESPONSE_DATA                          108
-#  define OCSP_R_NO_REVOKED_TIME                           109
-#  define OCSP_R_NO_SIGNER_KEY                             130
-#  define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE    110
-#  define OCSP_R_REQUEST_NOT_SIGNED                        128
-#  define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA      111
-#  define OCSP_R_ROOT_CA_NOT_TRUSTED                       112
-#  define OCSP_R_SIGNATURE_FAILURE                         117
-#  define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND              118
-#  define OCSP_R_STATUS_EXPIRED                            125
-#  define OCSP_R_STATUS_NOT_YET_VALID                      126
-#  define OCSP_R_STATUS_TOO_OLD                            127
-#  define OCSP_R_UNKNOWN_MESSAGE_DIGEST                    119
-#  define OCSP_R_UNKNOWN_NID                               120
-#  define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE            129
+#define OCSP_R_CERTIFICATE_VERIFY_ERROR 101
+#define OCSP_R_DIGEST_ERR 102
+#define OCSP_R_DIGEST_NAME_ERR 106
+#define OCSP_R_DIGEST_SIZE_ERR 107
+#define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD 122
+#define OCSP_R_ERROR_IN_THISUPDATE_FIELD 123
+#define OCSP_R_MISSING_OCSPSIGNING_USAGE 103
+#define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE 124
+#define OCSP_R_NOT_BASIC_RESPONSE 104
+#define OCSP_R_NO_CERTIFICATES_IN_CHAIN 105
+#define OCSP_R_NO_RESPONSE_DATA 108
+#define OCSP_R_NO_REVOKED_TIME 109
+#define OCSP_R_NO_SIGNER_KEY 130
+#define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 110
+#define OCSP_R_REQUEST_NOT_SIGNED 128
+#define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA 111
+#define OCSP_R_ROOT_CA_NOT_TRUSTED 112
+#define OCSP_R_SIGNATURE_FAILURE 117
+#define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND 118
+#define OCSP_R_STATUS_EXPIRED 125
+#define OCSP_R_STATUS_NOT_YET_VALID 126
+#define OCSP_R_STATUS_TOO_OLD 127
+#define OCSP_R_UNKNOWN_MESSAGE_DIGEST 119
+#define OCSP_R_UNKNOWN_NID 120
+#define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE 129
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/opensslconf.h b/include/openssl/opensslconf.h
index 1e83371f1a43..4a8d78efff70 100644
--- a/include/openssl/opensslconf.h
+++ b/include/openssl/opensslconf.h
@@ -8,10 +8,10 @@
  */
 
 #ifndef OPENSSL_OPENSSLCONF_H
-# define OPENSSL_OPENSSLCONF_H
-# pragma once
+#define OPENSSL_OPENSSLCONF_H
+#pragma once
 
-# include <openssl/configuration.h>
-# include <openssl/macros.h>
+#include <openssl/configuration.h>
+#include <openssl/macros.h>
 
-#endif  /* OPENSSL_OPENSSLCONF_H */
+#endif /* OPENSSL_OPENSSLCONF_H */
diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in
index 69b9caacf4dc..58b290ea55af 100644
--- a/include/openssl/opensslv.h.in
+++ b/include/openssl/opensslv.h.in
@@ -10,12 +10,12 @@
  */
 
 #ifndef OPENSSL_OPENSSLV_H
-# define OPENSSL_OPENSSLV_H
-# pragma once
+#define OPENSSL_OPENSSLV_H
+#pragma once
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * SECTION 1: VERSION DATA.  These will change for each release
@@ -26,9 +26,15 @@ extern "C" {
  *
  * These macros express version number MAJOR.MINOR.PATCH exactly
  */
+/* clang-format off */
 # define OPENSSL_VERSION_MAJOR  {- $config{major} -}
+/* clang-format on */
+/* clang-format off */
 # define OPENSSL_VERSION_MINOR  {- $config{minor} -}
+/* clang-format on */
+/* clang-format off */
 # define OPENSSL_VERSION_PATCH  {- $config{patch} -}
+/* clang-format on */
 
 /*
  * Additional version information
@@ -38,10 +44,14 @@ extern "C" {
  */
 
 /* Could be: #define OPENSSL_VERSION_PRE_RELEASE "-alpha.1" */
+/* clang-format off */
 # define OPENSSL_VERSION_PRE_RELEASE "{- $config{prerelease} -}"
+/* clang-format on */
 /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */
 /* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */
+/* clang-format off */
 # define OPENSSL_VERSION_BUILD_METADATA "{- $config{build_metadata} -}"
+/* clang-format on */
 
 /*
  * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA
@@ -56,14 +66,16 @@ extern "C" {
  * be related to the API version expressed with the macros above.
  * This is defined in free form.
  */
+/* clang-format off */
 # define OPENSSL_SHLIB_VERSION {- $config{shlib_version} -}
+/* clang-format on */
 
 /*
  * SECTION 2: USEFUL MACROS
  */
 
 /* For checking general API compatibility when preprocessing */
-# define OPENSSL_VERSION_PREREQ(maj,min)                                \
+#define OPENSSL_VERSION_PREREQ(maj, min) \
     ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min))
 
 /*
@@ -73,36 +85,46 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
+/* clang-format off */
 # define OPENSSL_VERSION_STR "{- $config{version} -}"
+/* clang-format on */
+/* clang-format off */
 # define OPENSSL_FULL_VERSION_STR "{- $config{full_version} -}"
+/* clang-format on */
 
 /*
  * SECTION 3: ADDITIONAL METADATA
  *
  * These strings are defined separately to allow them to be parsable.
  */
+/* clang-format off */
 # define OPENSSL_RELEASE_DATE "{- $config{release_date} -}"
+/* clang-format on */
 
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  */
 
+/* clang-format off */
 # define OPENSSL_VERSION_TEXT "OpenSSL {- "$config{full_version} $config{release_date}" -}"
+/* clang-format on */
 
+/* clang-format off */
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PP0L */
 # define OPENSSL_VERSION_NUMBER          \
     ( (OPENSSL_VERSION_MAJOR<<28)        \
       |(OPENSSL_VERSION_MINOR<<20)       \
       |(OPENSSL_VERSION_PATCH<<4)        \
       |0x0L )
+/* clang-format on */
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OPENSSLV_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_OPENSSLV_H
+#endif
 
-#endif                          /* OPENSSL_OPENSSLV_H */
+#endif /* OPENSSL_OPENSSLV_H */
diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h
index 82a58988ff2d..a562299b9f9a 100644
--- a/include/openssl/ossl_typ.h
+++ b/include/openssl/ossl_typ.h
@@ -13,4 +13,4 @@
  * This header file only exists for compatibility reasons with older
  * applications which #include <openssl/ossl_typ.h>.
  */
-# include <openssl/types.h>
+#include <openssl/types.h>
diff --git a/include/openssl/param_build.h b/include/openssl/param_build.h
index f29fdb2963d3..be6a0252100e 100644
--- a/include/openssl/param_build.h
+++ b/include/openssl/param_build.h
@@ -9,15 +9,15 @@
  */
 
 #ifndef OPENSSL_PARAM_BUILD_H
-# define OPENSSL_PARAM_BUILD_H
-# pragma once
+#define OPENSSL_PARAM_BUILD_H
+#pragma once
 
-# include <openssl/params.h>
-# include <openssl/types.h>
+#include <openssl/params.h>
+#include <openssl/types.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 OSSL_PARAM_BLD *OSSL_PARAM_BLD_new(void);
 OSSL_PARAM *OSSL_PARAM_BLD_to_param(OSSL_PARAM_BLD *bld);
@@ -25,39 +25,39 @@ void OSSL_PARAM_BLD_free(OSSL_PARAM_BLD *bld);
 
 int OSSL_PARAM_BLD_push_int(OSSL_PARAM_BLD *bld, const char *key, int val);
 int OSSL_PARAM_BLD_push_uint(OSSL_PARAM_BLD *bld, const char *key,
-                             unsigned int val);
+    unsigned int val);
 int OSSL_PARAM_BLD_push_long(OSSL_PARAM_BLD *bld, const char *key,
-                             long int val);
+    long int val);
 int OSSL_PARAM_BLD_push_ulong(OSSL_PARAM_BLD *bld, const char *key,
-                              unsigned long int val);
+    unsigned long int val);
 int OSSL_PARAM_BLD_push_int32(OSSL_PARAM_BLD *bld, const char *key,
-                              int32_t val);
+    int32_t val);
 int OSSL_PARAM_BLD_push_uint32(OSSL_PARAM_BLD *bld, const char *key,
-                               uint32_t val);
+    uint32_t val);
 int OSSL_PARAM_BLD_push_int64(OSSL_PARAM_BLD *bld, const char *key,
-                              int64_t val);
+    int64_t val);
 int OSSL_PARAM_BLD_push_uint64(OSSL_PARAM_BLD *bld, const char *key,
-                               uint64_t val);
+    uint64_t val);
 int OSSL_PARAM_BLD_push_size_t(OSSL_PARAM_BLD *bld, const char *key,
-                               size_t val);
+    size_t val);
 int OSSL_PARAM_BLD_push_time_t(OSSL_PARAM_BLD *bld, const char *key,
-                               time_t val);
+    time_t val);
 int OSSL_PARAM_BLD_push_double(OSSL_PARAM_BLD *bld, const char *key,
-                               double val);
+    double val);
 int OSSL_PARAM_BLD_push_BN(OSSL_PARAM_BLD *bld, const char *key,
-                           const BIGNUM *bn);
+    const BIGNUM *bn);
 int OSSL_PARAM_BLD_push_BN_pad(OSSL_PARAM_BLD *bld, const char *key,
-                               const BIGNUM *bn, size_t sz);
+    const BIGNUM *bn, size_t sz);
 int OSSL_PARAM_BLD_push_utf8_string(OSSL_PARAM_BLD *bld, const char *key,
-                                    const char *buf, size_t bsize);
+    const char *buf, size_t bsize);
 int OSSL_PARAM_BLD_push_utf8_ptr(OSSL_PARAM_BLD *bld, const char *key,
-                                 char *buf, size_t bsize);
+    char *buf, size_t bsize);
 int OSSL_PARAM_BLD_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
-                                     const void *buf, size_t bsize);
+    const void *buf, size_t bsize);
 int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
-                                  void *buf, size_t bsize);
+    void *buf, size_t bsize);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
-#endif  /* OPENSSL_PARAM_BUILD_H */
+#endif
+#endif /* OPENSSL_PARAM_BUILD_H */
diff --git a/include/openssl/params.h b/include/openssl/params.h
index d4b855dffb1f..73e0d41b7179 100644
--- a/include/openssl/params.h
+++ b/include/openssl/params.h
@@ -9,62 +9,62 @@
  */
 
 #ifndef OPENSSL_PARAMS_H
-# define OPENSSL_PARAMS_H
-# pragma once
+#define OPENSSL_PARAMS_H
+#pragma once
 
-# include <openssl/core.h>
-# include <openssl/bn.h>
+#include <openssl/core.h>
+#include <openssl/bn.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# define OSSL_PARAM_UNMODIFIED ((size_t)-1)
+#define OSSL_PARAM_UNMODIFIED ((size_t)-1)
 
-# define OSSL_PARAM_END \
+#define OSSL_PARAM_END \
     { NULL, 0, NULL, 0, 0 }
 
-# define OSSL_PARAM_DEFN(key, type, addr, sz)    \
+#define OSSL_PARAM_DEFN(key, type, addr, sz) \
     { (key), (type), (addr), (sz), OSSL_PARAM_UNMODIFIED }
 
 /* Basic parameter types without return sizes */
-# define OSSL_PARAM_int(key, addr) \
+#define OSSL_PARAM_int(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_INTEGER, (addr), sizeof(int))
-# define OSSL_PARAM_uint(key, addr) \
+#define OSSL_PARAM_uint(key, addr)                              \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UNSIGNED_INTEGER, (addr), \
-                    sizeof(unsigned int))
-# define OSSL_PARAM_long(key, addr) \
+        sizeof(unsigned int))
+#define OSSL_PARAM_long(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_INTEGER, (addr), sizeof(long int))
-# define OSSL_PARAM_ulong(key, addr) \
+#define OSSL_PARAM_ulong(key, addr)                             \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UNSIGNED_INTEGER, (addr), \
-                    sizeof(unsigned long int))
-# define OSSL_PARAM_int32(key, addr) \
+        sizeof(unsigned long int))
+#define OSSL_PARAM_int32(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_INTEGER, (addr), sizeof(int32_t))
-# define OSSL_PARAM_uint32(key, addr) \
+#define OSSL_PARAM_uint32(key, addr)                            \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UNSIGNED_INTEGER, (addr), \
-                    sizeof(uint32_t))
-# define OSSL_PARAM_int64(key, addr) \
+        sizeof(uint32_t))
+#define OSSL_PARAM_int64(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_INTEGER, (addr), sizeof(int64_t))
-# define OSSL_PARAM_uint64(key, addr) \
+#define OSSL_PARAM_uint64(key, addr)                            \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UNSIGNED_INTEGER, (addr), \
-                    sizeof(uint64_t))
-# define OSSL_PARAM_size_t(key, addr) \
+        sizeof(uint64_t))
+#define OSSL_PARAM_size_t(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UNSIGNED_INTEGER, (addr), sizeof(size_t))
-# define OSSL_PARAM_time_t(key, addr) \
+#define OSSL_PARAM_time_t(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_INTEGER, (addr), sizeof(time_t))
-# define OSSL_PARAM_double(key, addr) \
+#define OSSL_PARAM_double(key, addr) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_REAL, (addr), sizeof(double))
 
-# define OSSL_PARAM_BN(key, bn, sz) \
+#define OSSL_PARAM_BN(key, bn, sz) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UNSIGNED_INTEGER, (bn), (sz))
-# define OSSL_PARAM_utf8_string(key, addr, sz) \
+#define OSSL_PARAM_utf8_string(key, addr, sz) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UTF8_STRING, (addr), sz)
-# define OSSL_PARAM_octet_string(key, addr, sz) \
+#define OSSL_PARAM_octet_string(key, addr, sz) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_OCTET_STRING, (addr), sz)
 
-# define OSSL_PARAM_utf8_ptr(key, addr, sz) \
+#define OSSL_PARAM_utf8_ptr(key, addr, sz) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_UTF8_PTR, (addr), sz)
-# define OSSL_PARAM_octet_ptr(key, addr, sz) \
+#define OSSL_PARAM_octet_ptr(key, addr, sz) \
     OSSL_PARAM_DEFN((key), OSSL_PARAM_OCTET_PTR, (addr), sz)
 
 /* Search an OSSL_PARAM array for a matching name */
@@ -83,25 +83,25 @@ OSSL_PARAM OSSL_PARAM_construct_uint64(const char *key, uint64_t *buf);
 OSSL_PARAM OSSL_PARAM_construct_size_t(const char *key, size_t *buf);
 OSSL_PARAM OSSL_PARAM_construct_time_t(const char *key, time_t *buf);
 OSSL_PARAM OSSL_PARAM_construct_BN(const char *key, unsigned char *buf,
-                                   size_t bsize);
+    size_t bsize);
 OSSL_PARAM OSSL_PARAM_construct_double(const char *key, double *buf);
 OSSL_PARAM OSSL_PARAM_construct_utf8_string(const char *key, char *buf,
-                                            size_t bsize);
+    size_t bsize);
 OSSL_PARAM OSSL_PARAM_construct_utf8_ptr(const char *key, char **buf,
-                                         size_t bsize);
+    size_t bsize);
 OSSL_PARAM OSSL_PARAM_construct_octet_string(const char *key, void *buf,
-                                             size_t bsize);
+    size_t bsize);
 OSSL_PARAM OSSL_PARAM_construct_octet_ptr(const char *key, void **buf,
-                                          size_t bsize);
+    size_t bsize);
 OSSL_PARAM OSSL_PARAM_construct_end(void);
 
 int OSSL_PARAM_allocate_from_text(OSSL_PARAM *to,
-                                  const OSSL_PARAM *paramdefs,
-                                  const char *key, const char *value,
-                                  size_t value_n, int *found);
+    const OSSL_PARAM *paramdefs,
+    const char *key, const char *value,
+    size_t value_n, int *found);
 
 int OSSL_PARAM_print_to_bio(const OSSL_PARAM *params, BIO *bio,
-                            int print_values);
+    int print_values);
 
 int OSSL_PARAM_get_int(const OSSL_PARAM *p, int *val);
 int OSSL_PARAM_get_uint(const OSSL_PARAM *p, unsigned int *val);
@@ -135,20 +135,20 @@ int OSSL_PARAM_get_utf8_string(const OSSL_PARAM *p, char **val, size_t max_len);
 int OSSL_PARAM_set_utf8_string(OSSL_PARAM *p, const char *val);
 
 int OSSL_PARAM_get_octet_string(const OSSL_PARAM *p, void **val, size_t max_len,
-                                size_t *used_len);
+    size_t *used_len);
 int OSSL_PARAM_set_octet_string(OSSL_PARAM *p, const void *val, size_t len);
 
 int OSSL_PARAM_get_utf8_ptr(const OSSL_PARAM *p, const char **val);
 int OSSL_PARAM_set_utf8_ptr(OSSL_PARAM *p, const char *val);
 
 int OSSL_PARAM_get_octet_ptr(const OSSL_PARAM *p, const void **val,
-                             size_t *used_len);
+    size_t *used_len);
 int OSSL_PARAM_set_octet_ptr(OSSL_PARAM *p, const void *val,
-                             size_t used_len);
+    size_t used_len);
 
 int OSSL_PARAM_get_utf8_string_ptr(const OSSL_PARAM *p, const char **val);
 int OSSL_PARAM_get_octet_string_ptr(const OSSL_PARAM *p, const void **val,
-                                    size_t *used_len);
+    size_t *used_len);
 
 int OSSL_PARAM_modified(const OSSL_PARAM *p);
 void OSSL_PARAM_set_all_unmodified(OSSL_PARAM *p);
@@ -157,7 +157,7 @@ OSSL_PARAM *OSSL_PARAM_dup(const OSSL_PARAM *p);
 OSSL_PARAM *OSSL_PARAM_merge(const OSSL_PARAM *p1, const OSSL_PARAM *p2);
 void OSSL_PARAM_free(OSSL_PARAM *p);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index de1b6581f28f..fa64aaf4ca27 100644
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -8,63 +8,63 @@
  */
 
 #ifndef OPENSSL_PEM_H
-# define OPENSSL_PEM_H
-# pragma once
+#define OPENSSL_PEM_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PEM_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_PEM_H
+#endif
 
-# include <openssl/e_os2.h>
-# include <openssl/bio.h>
-# include <openssl/safestack.h>
-# include <openssl/evp.h>
-# include <openssl/x509.h>
-# include <openssl/pemerr.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/e_os2.h>
+#include <openssl/bio.h>
+#include <openssl/safestack.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pemerr.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define PEM_BUFSIZE             1024
+#define PEM_BUFSIZE 1024
 
-# define PEM_STRING_X509_OLD     "X509 CERTIFICATE"
-# define PEM_STRING_X509         "CERTIFICATE"
-# define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"
-# define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
-# define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"
-# define PEM_STRING_X509_CRL     "X509 CRL"
-# define PEM_STRING_EVP_PKEY     "ANY PRIVATE KEY"
-# define PEM_STRING_PUBLIC       "PUBLIC KEY"
-# define PEM_STRING_RSA          "RSA PRIVATE KEY"
-# define PEM_STRING_RSA_PUBLIC   "RSA PUBLIC KEY"
-# define PEM_STRING_DSA          "DSA PRIVATE KEY"
-# define PEM_STRING_DSA_PUBLIC   "DSA PUBLIC KEY"
-# define PEM_STRING_PKCS7        "PKCS7"
-# define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
-# define PEM_STRING_PKCS8        "ENCRYPTED PRIVATE KEY"
-# define PEM_STRING_PKCS8INF     "PRIVATE KEY"
-# define PEM_STRING_DHPARAMS     "DH PARAMETERS"
-# define PEM_STRING_DHXPARAMS    "X9.42 DH PARAMETERS"
-# define PEM_STRING_SSL_SESSION  "SSL SESSION PARAMETERS"
-# define PEM_STRING_DSAPARAMS    "DSA PARAMETERS"
-# define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
-# define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
-# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
-# define PEM_STRING_PARAMETERS   "PARAMETERS"
-# define PEM_STRING_CMS          "CMS"
-# define PEM_STRING_SM2PRIVATEKEY "SM2 PRIVATE KEY"
-# define PEM_STRING_SM2PARAMETERS "SM2 PARAMETERS"
-# define PEM_STRING_ACERT        "ATTRIBUTE CERTIFICATE"
+#define PEM_STRING_X509_OLD "X509 CERTIFICATE"
+#define PEM_STRING_X509 "CERTIFICATE"
+#define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"
+#define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
+#define PEM_STRING_X509_REQ "CERTIFICATE REQUEST"
+#define PEM_STRING_X509_CRL "X509 CRL"
+#define PEM_STRING_EVP_PKEY "ANY PRIVATE KEY"
+#define PEM_STRING_PUBLIC "PUBLIC KEY"
+#define PEM_STRING_RSA "RSA PRIVATE KEY"
+#define PEM_STRING_RSA_PUBLIC "RSA PUBLIC KEY"
+#define PEM_STRING_DSA "DSA PRIVATE KEY"
+#define PEM_STRING_DSA_PUBLIC "DSA PUBLIC KEY"
+#define PEM_STRING_PKCS7 "PKCS7"
+#define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
+#define PEM_STRING_PKCS8 "ENCRYPTED PRIVATE KEY"
+#define PEM_STRING_PKCS8INF "PRIVATE KEY"
+#define PEM_STRING_DHPARAMS "DH PARAMETERS"
+#define PEM_STRING_DHXPARAMS "X9.42 DH PARAMETERS"
+#define PEM_STRING_SSL_SESSION "SSL SESSION PARAMETERS"
+#define PEM_STRING_DSAPARAMS "DSA PARAMETERS"
+#define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
+#define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
+#define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
+#define PEM_STRING_PARAMETERS "PARAMETERS"
+#define PEM_STRING_CMS "CMS"
+#define PEM_STRING_SM2PRIVATEKEY "SM2 PRIVATE KEY"
+#define PEM_STRING_SM2PARAMETERS "SM2 PARAMETERS"
+#define PEM_STRING_ACERT "ATTRIBUTE CERTIFICATE"
 
-# define PEM_TYPE_ENCRYPTED      10
-# define PEM_TYPE_MIC_ONLY       20
-# define PEM_TYPE_MIC_CLEAR      30
-# define PEM_TYPE_CLEAR          40
+#define PEM_TYPE_ENCRYPTED 10
+#define PEM_TYPE_MIC_ONLY 20
+#define PEM_TYPE_MIC_CLEAR 30
+#define PEM_TYPE_CLEAR 40
 
 /*
  * These macros make the PEM_read/PEM_write functions easier to maintain and
@@ -72,148 +72,148 @@ extern "C" {
  * IMPLEMENT_PEM_rw_cb(...)
  */
 
-# define PEM_read_cb_fnsig(name, type, INTYPE, readname)                \
-    type *PEM_##readname##_##name(INTYPE *out, type **x,                \
-                                 pem_password_cb *cb, void *u)
-# define PEM_read_cb_ex_fnsig(name, type, INTYPE, readname)             \
-    type *PEM_##readname##_##name##_ex(INTYPE *out, type **x,           \
-                                       pem_password_cb *cb, void *u,    \
-                                       OSSL_LIB_CTX *libctx,            \
-                                       const char *propq)
+#define PEM_read_cb_fnsig(name, type, INTYPE, readname)  \
+    type *PEM_##readname##_##name(INTYPE *out, type **x, \
+        pem_password_cb *cb, void *u)
+#define PEM_read_cb_ex_fnsig(name, type, INTYPE, readname)    \
+    type *PEM_##readname##_##name##_ex(INTYPE *out, type **x, \
+        pem_password_cb *cb, void *u,                         \
+        OSSL_LIB_CTX *libctx,                                 \
+        const char *propq)
 
-# define PEM_write_fnsig(name, type, OUTTYPE, writename)                \
+#define PEM_write_fnsig(name, type, OUTTYPE, writename) \
     int PEM_##writename##_##name(OUTTYPE *out, const type *x)
-# define PEM_write_cb_fnsig(name, type, OUTTYPE, writename)             \
-    int PEM_##writename##_##name(OUTTYPE *out, const type *x,           \
-                                 const EVP_CIPHER *enc,                 \
-                                 const unsigned char *kstr, int klen,   \
-                                 pem_password_cb *cb, void *u)
-# define PEM_write_ex_fnsig(name, type, OUTTYPE, writename)             \
-    int PEM_##writename##_##name##_ex(OUTTYPE *out, const type *x,      \
-                                      OSSL_LIB_CTX *libctx,             \
-                                      const char *propq)
-# define PEM_write_cb_ex_fnsig(name, type, OUTTYPE, writename)          \
-    int PEM_##writename##_##name##_ex(OUTTYPE *out, const type *x,      \
-                                      const EVP_CIPHER *enc,            \
-                                      const unsigned char *kstr, int klen, \
-                                      pem_password_cb *cb, void *u,     \
-                                      OSSL_LIB_CTX *libctx,             \
-                                      const char *propq)
+#define PEM_write_cb_fnsig(name, type, OUTTYPE, writename)    \
+    int PEM_##writename##_##name(OUTTYPE *out, const type *x, \
+        const EVP_CIPHER *enc,                                \
+        const unsigned char *kstr, int klen,                  \
+        pem_password_cb *cb, void *u)
+#define PEM_write_ex_fnsig(name, type, OUTTYPE, writename)         \
+    int PEM_##writename##_##name##_ex(OUTTYPE *out, const type *x, \
+        OSSL_LIB_CTX *libctx,                                      \
+        const char *propq)
+#define PEM_write_cb_ex_fnsig(name, type, OUTTYPE, writename)      \
+    int PEM_##writename##_##name##_ex(OUTTYPE *out, const type *x, \
+        const EVP_CIPHER *enc,                                     \
+        const unsigned char *kstr, int klen,                       \
+        pem_password_cb *cb, void *u,                              \
+        OSSL_LIB_CTX *libctx,                                      \
+        const char *propq)
 
-# ifdef OPENSSL_NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#  endif
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-#  endif
-# else
+#define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
+#define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
+#endif
+#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
+#endif
+#else
 
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1)                  \
+#define IMPLEMENT_PEM_read_fp(name, type, str, asn1)                        \
     type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u) \
-    {                                                                   \
-        return PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str, fp,        \
-                             (void **)x, cb, u);                        \
+    {                                                                       \
+        return PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str, fp,            \
+            (void **)x, cb, u);                                             \
     }
 
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1)                 \
-    PEM_write_fnsig(name, type, FILE, write)                            \
-    {                                                                   \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1, str, out,      \
-                              x, NULL, NULL, 0, NULL, NULL);            \
+#define IMPLEMENT_PEM_write_fp(name, type, str, asn1)              \
+    PEM_write_fnsig(name, type, FILE, write)                       \
+    {                                                              \
+        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1, str, out, \
+            x, NULL, NULL, 0, NULL, NULL);                         \
     }
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)  \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
     IMPLEMENT_PEM_write_fp(name, type, str, asn1)
-#  endif
+#endif
 
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)              \
-    PEM_write_cb_fnsig(name, type, FILE, write)                         \
-    {                                                                   \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1, str, out,      \
-                              x, enc, kstr, klen, cb, u);               \
+#define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)           \
+    PEM_write_cb_fnsig(name, type, FILE, write)                    \
+    {                                                              \
+        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1, str, out, \
+            x, enc, kstr, klen, cb, u);                            \
     }
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)       \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
     IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
-#  endif
-# endif
+#endif
+#endif
 
-# define IMPLEMENT_PEM_read_bio(name, type, str, asn1)                  \
-    type *PEM_read_bio_##name(BIO *bp, type **x,                        \
-                              pem_password_cb *cb, void *u)             \
-    {                                                                   \
-        return PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str, bp,    \
-                                 (void **)x, cb, u);                    \
+#define IMPLEMENT_PEM_read_bio(name, type, str, asn1)                \
+    type *PEM_read_bio_##name(BIO *bp, type **x,                     \
+        pem_password_cb *cb, void *u)                                \
+    {                                                                \
+        return PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str, bp, \
+            (void **)x, cb, u);                                      \
     }
 
-# define IMPLEMENT_PEM_write_bio(name, type, str, asn1)                 \
-    PEM_write_fnsig(name, type, BIO, write_bio)                         \
-    {                                                                   \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1, str, out,  \
-                                  x, NULL,NULL,0,NULL,NULL);            \
+#define IMPLEMENT_PEM_write_bio(name, type, str, asn1)                 \
+    PEM_write_fnsig(name, type, BIO, write_bio)                        \
+    {                                                                  \
+        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1, str, out, \
+            x, NULL, NULL, 0, NULL, NULL);                             \
     }
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1)   \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
     IMPLEMENT_PEM_write_bio(name, type, str, asn1)
-# endif
+#endif
 
-# define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1)              \
-    PEM_write_cb_fnsig(name, type, BIO, write_bio)                      \
-    {                                                                   \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1, str, out,  \
-                                  x, enc, kstr, klen, cb, u);           \
+#define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1)              \
+    PEM_write_cb_fnsig(name, type, BIO, write_bio)                     \
+    {                                                                  \
+        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1, str, out, \
+            x, enc, kstr, klen, cb, u);                                \
     }
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1)  \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
     IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1)
-# endif
+#endif
 
-# define IMPLEMENT_PEM_write(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp(name, type, str, asn1)
+#define IMPLEMENT_PEM_write(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_fp(name, type, str, asn1)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)
+#endif
 
-# define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
+#define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
+    IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)
+#endif
 
-# define IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_fp(name, type, str, asn1)
+#define IMPLEMENT_PEM_read(name, type, str, asn1) \
+    IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
+    IMPLEMENT_PEM_read_fp(name, type, str, asn1)
 
-# define IMPLEMENT_PEM_rw(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write(name, type, str, asn1)
+#define IMPLEMENT_PEM_rw(name, type, str, asn1) \
+    IMPLEMENT_PEM_read(name, type, str, asn1)   \
+    IMPLEMENT_PEM_write(name, type, str, asn1)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_const(name, type, str, asn1)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
+    IMPLEMENT_PEM_read(name, type, str, asn1)         \
+    IMPLEMENT_PEM_write_const(name, type, str, asn1)
+#endif
 
-# define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb(name, type, str, asn1)
+#define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
+    IMPLEMENT_PEM_read(name, type, str, asn1)      \
+    IMPLEMENT_PEM_write_cb(name, type, str, asn1)
 
 /* These are the same except they are for the declarations */
 
@@ -222,226 +222,226 @@ extern "C" {
  * and is there to quiet pre-C99 compilers that may complain about empty
  * arguments in macro calls.
  */
-# if defined(OPENSSL_NO_STDIO)
+#if defined(OPENSSL_NO_STDIO)
 
-#  define DECLARE_PEM_read_fp_attr(attr, name, type) /**/
-#  define DECLARE_PEM_read_fp_ex_attr(attr, name, type) /**/
-#  define DECLARE_PEM_write_fp_attr(attr, name, type) /**/
-#  define DECLARE_PEM_write_fp_ex_attr(attr, name, type) /**/
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define DECLARE_PEM_write_fp_const_attr(attr, name, type) /**/
-#  endif
-#  define DECLARE_PEM_write_cb_fp_attr(attr, name, type) /**/
-#  define DECLARE_PEM_write_cb_fp_ex_attr(attr, name, type) /**/
+#define DECLARE_PEM_read_fp_attr(attr, name, type) /**/
+#define DECLARE_PEM_read_fp_ex_attr(attr, name, type) /**/
+#define DECLARE_PEM_write_fp_attr(attr, name, type) /**/
+#define DECLARE_PEM_write_fp_ex_attr(attr, name, type) /**/
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DECLARE_PEM_write_fp_const_attr(attr, name, type) /**/
+#endif
+#define DECLARE_PEM_write_cb_fp_attr(attr, name, type) /**/
+#define DECLARE_PEM_write_cb_fp_ex_attr(attr, name, type) /**/
 
-# else
+#else
 
-#  define DECLARE_PEM_read_fp_attr(attr, name, type)                        \
+#define DECLARE_PEM_read_fp_attr(attr, name, type) \
     attr PEM_read_cb_fnsig(name, type, FILE, read);
-#  define DECLARE_PEM_read_fp_ex_attr(attr, name, type)                     \
-    attr PEM_read_cb_fnsig(name, type, FILE, read);                         \
+#define DECLARE_PEM_read_fp_ex_attr(attr, name, type) \
+    attr PEM_read_cb_fnsig(name, type, FILE, read);   \
     attr PEM_read_cb_ex_fnsig(name, type, FILE, read);
 
-#  define DECLARE_PEM_write_fp_attr(attr, name, type)                       \
+#define DECLARE_PEM_write_fp_attr(attr, name, type) \
     attr PEM_write_fnsig(name, type, FILE, write);
-#  define DECLARE_PEM_write_fp_ex_attr(attr, name, type)                    \
-    attr PEM_write_fnsig(name, type, FILE, write);                          \
+#define DECLARE_PEM_write_fp_ex_attr(attr, name, type) \
+    attr PEM_write_fnsig(name, type, FILE, write);     \
     attr PEM_write_ex_fnsig(name, type, FILE, write);
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define DECLARE_PEM_write_fp_const_attr(attr, name, type)                \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DECLARE_PEM_write_fp_const_attr(attr, name, type) \
     attr PEM_write_fnsig(name, type, FILE, write);
-#  endif
-#  define DECLARE_PEM_write_cb_fp_attr(attr, name, type)                    \
+#endif
+#define DECLARE_PEM_write_cb_fp_attr(attr, name, type) \
     attr PEM_write_cb_fnsig(name, type, FILE, write);
-#  define DECLARE_PEM_write_cb_fp_ex_attr(attr, name, type)                 \
-    attr PEM_write_cb_fnsig(name, type, FILE, write);                       \
+#define DECLARE_PEM_write_cb_fp_ex_attr(attr, name, type) \
+    attr PEM_write_cb_fnsig(name, type, FILE, write);     \
     attr PEM_write_cb_ex_fnsig(name, type, FILE, write);
 
-# endif
+#endif
 
-# define DECLARE_PEM_read_fp(name, type)                                    \
+#define DECLARE_PEM_read_fp(name, type) \
     DECLARE_PEM_read_fp_attr(extern, name, type)
-# define DECLARE_PEM_write_fp(name, type)                                   \
+#define DECLARE_PEM_write_fp(name, type) \
     DECLARE_PEM_write_fp_attr(extern, name, type)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define DECLARE_PEM_write_fp_const(name, type)                           \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DECLARE_PEM_write_fp_const(name, type) \
     DECLARE_PEM_write_fp_const_attr(extern, name, type)
-# endif
-# define DECLARE_PEM_write_cb_fp(name, type)                                \
+#endif
+#define DECLARE_PEM_write_cb_fp(name, type) \
     DECLARE_PEM_write_cb_fp_attr(extern, name, type)
 
-#  define DECLARE_PEM_read_bio_attr(attr, name, type)                       \
+#define DECLARE_PEM_read_bio_attr(attr, name, type) \
     attr PEM_read_cb_fnsig(name, type, BIO, read_bio);
-#  define DECLARE_PEM_read_bio_ex_attr(attr, name, type)                    \
-    attr PEM_read_cb_fnsig(name, type, BIO, read_bio);                      \
+#define DECLARE_PEM_read_bio_ex_attr(attr, name, type) \
+    attr PEM_read_cb_fnsig(name, type, BIO, read_bio); \
     attr PEM_read_cb_ex_fnsig(name, type, BIO, read_bio);
-# define DECLARE_PEM_read_bio(name, type)                                   \
+#define DECLARE_PEM_read_bio(name, type) \
     DECLARE_PEM_read_bio_attr(extern, name, type)
-# define DECLARE_PEM_read_bio_ex(name, type)                                \
+#define DECLARE_PEM_read_bio_ex(name, type) \
     DECLARE_PEM_read_bio_ex_attr(extern, name, type)
 
-# define DECLARE_PEM_write_bio_attr(attr, name, type)                       \
+#define DECLARE_PEM_write_bio_attr(attr, name, type) \
     attr PEM_write_fnsig(name, type, BIO, write_bio);
-# define DECLARE_PEM_write_bio_ex_attr(attr, name, type)                    \
-    attr PEM_write_fnsig(name, type, BIO, write_bio);                       \
+#define DECLARE_PEM_write_bio_ex_attr(attr, name, type) \
+    attr PEM_write_fnsig(name, type, BIO, write_bio);   \
     attr PEM_write_ex_fnsig(name, type, BIO, write_bio);
-# define DECLARE_PEM_write_bio(name, type)                                  \
+#define DECLARE_PEM_write_bio(name, type) \
     DECLARE_PEM_write_bio_attr(extern, name, type)
-# define DECLARE_PEM_write_bio_ex(name, type)                               \
+#define DECLARE_PEM_write_bio_ex(name, type) \
     DECLARE_PEM_write_bio_ex_attr(extern, name, type)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define DECLARE_PEM_write_bio_const_attr(attr, name, type)                \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DECLARE_PEM_write_bio_const_attr(attr, name, type) \
     attr PEM_write_fnsig(name, type, BIO, write_bio);
-#  define DECLARE_PEM_write_bio_const(name, type)      \
+#define DECLARE_PEM_write_bio_const(name, type) \
     DECLARE_PEM_write_bio_const_attr(extern, name, type)
-# endif
+#endif
 
-# define DECLARE_PEM_write_cb_bio_attr(attr, name, type)                    \
+#define DECLARE_PEM_write_cb_bio_attr(attr, name, type) \
     attr PEM_write_cb_fnsig(name, type, BIO, write_bio);
-# define DECLARE_PEM_write_cb_bio_ex_attr(attr, name, type)                 \
-    attr PEM_write_cb_fnsig(name, type, BIO, write_bio);                    \
+#define DECLARE_PEM_write_cb_bio_ex_attr(attr, name, type) \
+    attr PEM_write_cb_fnsig(name, type, BIO, write_bio);   \
     attr PEM_write_cb_ex_fnsig(name, type, BIO, write_bio);
-# define DECLARE_PEM_write_cb_bio(name, type)                               \
+#define DECLARE_PEM_write_cb_bio(name, type) \
     DECLARE_PEM_write_cb_bio_attr(extern, name, type)
-# define DECLARE_PEM_write_cb_ex_bio(name, type)                            \
+#define DECLARE_PEM_write_cb_ex_bio(name, type) \
     DECLARE_PEM_write_cb_bio_ex_attr(extern, name, type)
 
-# define DECLARE_PEM_write_attr(attr, name, type)                           \
-    DECLARE_PEM_write_bio_attr(attr, name, type)                            \
+#define DECLARE_PEM_write_attr(attr, name, type) \
+    DECLARE_PEM_write_bio_attr(attr, name, type) \
     DECLARE_PEM_write_fp_attr(attr, name, type)
-# define DECLARE_PEM_write_ex_attr(attr, name, type)                        \
-    DECLARE_PEM_write_bio_ex_attr(attr, name, type)                         \
+#define DECLARE_PEM_write_ex_attr(attr, name, type) \
+    DECLARE_PEM_write_bio_ex_attr(attr, name, type) \
     DECLARE_PEM_write_fp_ex_attr(attr, name, type)
-# define DECLARE_PEM_write(name, type) \
+#define DECLARE_PEM_write(name, type) \
     DECLARE_PEM_write_attr(extern, name, type)
-# define DECLARE_PEM_write_ex(name, type) \
+#define DECLARE_PEM_write_ex(name, type) \
     DECLARE_PEM_write_ex_attr(extern, name, type)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define DECLARE_PEM_write_const_attr(attr, name, type)                    \
-    DECLARE_PEM_write_bio_const_attr(attr, name, type)                      \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DECLARE_PEM_write_const_attr(attr, name, type) \
+    DECLARE_PEM_write_bio_const_attr(attr, name, type) \
     DECLARE_PEM_write_fp_const_attr(attr, name, type)
-#  define DECLARE_PEM_write_const(name, type)                               \
+#define DECLARE_PEM_write_const(name, type) \
     DECLARE_PEM_write_const_attr(extern, name, type)
-# endif
-# define DECLARE_PEM_write_cb_attr(attr, name, type)                        \
-    DECLARE_PEM_write_cb_bio_attr(attr, name, type)                         \
+#endif
+#define DECLARE_PEM_write_cb_attr(attr, name, type) \
+    DECLARE_PEM_write_cb_bio_attr(attr, name, type) \
     DECLARE_PEM_write_cb_fp_attr(attr, name, type)
-# define DECLARE_PEM_write_cb_ex_attr(attr, name, type)                     \
-    DECLARE_PEM_write_cb_bio_ex_attr(attr, name, type)                      \
+#define DECLARE_PEM_write_cb_ex_attr(attr, name, type) \
+    DECLARE_PEM_write_cb_bio_ex_attr(attr, name, type) \
     DECLARE_PEM_write_cb_fp_ex_attr(attr, name, type)
-# define DECLARE_PEM_write_cb(name, type)                                   \
+#define DECLARE_PEM_write_cb(name, type) \
     DECLARE_PEM_write_cb_attr(extern, name, type)
-# define DECLARE_PEM_write_cb_ex(name, type)                                \
+#define DECLARE_PEM_write_cb_ex(name, type) \
     DECLARE_PEM_write_cb_ex_attr(extern, name, type)
-# define DECLARE_PEM_read_attr(attr, name, type)                            \
-    DECLARE_PEM_read_bio_attr(attr, name, type)                             \
+#define DECLARE_PEM_read_attr(attr, name, type) \
+    DECLARE_PEM_read_bio_attr(attr, name, type) \
     DECLARE_PEM_read_fp_attr(attr, name, type)
-# define DECLARE_PEM_read_ex_attr(attr, name, type)                         \
-    DECLARE_PEM_read_bio_ex_attr(attr, name, type)                          \
+#define DECLARE_PEM_read_ex_attr(attr, name, type) \
+    DECLARE_PEM_read_bio_ex_attr(attr, name, type) \
     DECLARE_PEM_read_fp_ex_attr(attr, name, type)
-# define DECLARE_PEM_read(name, type)                                       \
+#define DECLARE_PEM_read(name, type) \
     DECLARE_PEM_read_attr(extern, name, type)
-# define DECLARE_PEM_read_ex(name, type)                                    \
+#define DECLARE_PEM_read_ex(name, type) \
     DECLARE_PEM_read_ex_attr(extern, name, type)
-# define DECLARE_PEM_rw_attr(attr, name, type)                              \
-    DECLARE_PEM_read_attr(attr, name, type)                                 \
+#define DECLARE_PEM_rw_attr(attr, name, type) \
+    DECLARE_PEM_read_attr(attr, name, type)   \
     DECLARE_PEM_write_attr(attr, name, type)
-# define DECLARE_PEM_rw_ex_attr(attr, name, type)                           \
-    DECLARE_PEM_read_ex_attr(attr, name, type)                              \
+#define DECLARE_PEM_rw_ex_attr(attr, name, type) \
+    DECLARE_PEM_read_ex_attr(attr, name, type)   \
     DECLARE_PEM_write_ex_attr(attr, name, type)
-# define DECLARE_PEM_rw(name, type) \
+#define DECLARE_PEM_rw(name, type) \
     DECLARE_PEM_rw_attr(extern, name, type)
-# define DECLARE_PEM_rw_ex(name, type) \
+#define DECLARE_PEM_rw_ex(name, type) \
     DECLARE_PEM_rw_ex_attr(extern, name, type)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define DECLARE_PEM_rw_const_attr(attr, name, type)                       \
-    DECLARE_PEM_read_attr(attr, name, type)                                 \
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define DECLARE_PEM_rw_const_attr(attr, name, type) \
+    DECLARE_PEM_read_attr(attr, name, type)         \
     DECLARE_PEM_write_const_attr(attr, name, type)
-#  define DECLARE_PEM_rw_const(name, type) \
+#define DECLARE_PEM_rw_const(name, type) \
     DECLARE_PEM_rw_const_attr(extern, name, type)
-# endif
-# define DECLARE_PEM_rw_cb_attr(attr, name, type)                           \
-    DECLARE_PEM_read_attr(attr, name, type)                                 \
+#endif
+#define DECLARE_PEM_rw_cb_attr(attr, name, type) \
+    DECLARE_PEM_read_attr(attr, name, type)      \
     DECLARE_PEM_write_cb_attr(attr, name, type)
-# define DECLARE_PEM_rw_cb_ex_attr(attr, name, type)                        \
-    DECLARE_PEM_read_ex_attr(attr, name, type)                              \
+#define DECLARE_PEM_rw_cb_ex_attr(attr, name, type) \
+    DECLARE_PEM_read_ex_attr(attr, name, type)      \
     DECLARE_PEM_write_cb_ex_attr(attr, name, type)
-# define DECLARE_PEM_rw_cb(name, type) \
+#define DECLARE_PEM_rw_cb(name, type) \
     DECLARE_PEM_rw_cb_attr(extern, name, type)
-# define DECLARE_PEM_rw_cb_ex(name, type) \
+#define DECLARE_PEM_rw_cb_ex(name, type) \
     DECLARE_PEM_rw_cb_ex_attr(extern, name, type)
 
 int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
 int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,
-                  pem_password_cb *callback, void *u);
+    pem_password_cb *callback, void *u);
 
 int PEM_read_bio(BIO *bp, char **name, char **header,
-                 unsigned char **data, long *len);
-#   define PEM_FLAG_SECURE             0x1
-#   define PEM_FLAG_EAY_COMPATIBLE     0x2
-#   define PEM_FLAG_ONLY_B64           0x4
+    unsigned char **data, long *len);
+#define PEM_FLAG_SECURE 0x1
+#define PEM_FLAG_EAY_COMPATIBLE 0x2
+#define PEM_FLAG_ONLY_B64 0x4
 int PEM_read_bio_ex(BIO *bp, char **name, char **header,
-                    unsigned char **data, long *len, unsigned int flags);
+    unsigned char **data, long *len, unsigned int flags);
 int PEM_bytes_read_bio_secmem(unsigned char **pdata, long *plen, char **pnm,
-                              const char *name, BIO *bp, pem_password_cb *cb,
-                              void *u);
+    const char *name, BIO *bp, pem_password_cb *cb,
+    void *u);
 int PEM_write_bio(BIO *bp, const char *name, const char *hdr,
-                  const unsigned char *data, long len);
+    const unsigned char *data, long len);
 int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
-                       const char *name, BIO *bp, pem_password_cb *cb,
-                       void *u);
+    const char *name, BIO *bp, pem_password_cb *cb,
+    void *u);
 void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
-                        pem_password_cb *cb, void *u);
+    pem_password_cb *cb, void *u);
 int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp,
-                       const void *x, const EVP_CIPHER *enc,
-                       const unsigned char *kstr, int klen,
-                       pem_password_cb *cb, void *u);
+    const void *x, const EVP_CIPHER *enc,
+    const unsigned char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 int PEM_ASN1_write_bio_ctx(OSSL_i2d_of_void_ctx *i2d, void *vctx,
-                           const char *name, BIO *bp, const void *x,
-                           const EVP_CIPHER *enc, const unsigned char *kstr,
-                           int klen, pem_password_cb *cb, void *u);
+    const char *name, BIO *bp, const void *x,
+    const EVP_CIPHER *enc, const unsigned char *kstr,
+    int klen, pem_password_cb *cb, void *u);
 
 STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
-                                            pem_password_cb *cb, void *u);
+    pem_password_cb *cb, void *u);
 STACK_OF(X509_INFO)
 *PEM_X509_INFO_read_bio_ex(BIO *bp, STACK_OF(X509_INFO) *sk,
-                           pem_password_cb *cb, void *u, OSSL_LIB_CTX *libctx,
-                           const char *propq);
+    pem_password_cb *cb, void *u, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 int PEM_X509_INFO_write_bio(BIO *bp, const X509_INFO *xi, EVP_CIPHER *enc,
-                            const unsigned char *kstr, int klen,
-                            pem_password_cb *cd, void *u);
+    const unsigned char *kstr, int klen,
+    pem_password_cb *cd, void *u);
 
 #ifndef OPENSSL_NO_STDIO
 int PEM_read(FILE *fp, char **name, char **header,
-             unsigned char **data, long *len);
+    unsigned char **data, long *len);
 int PEM_write(FILE *fp, const char *name, const char *hdr,
-              const unsigned char *data, long len);
+    const unsigned char *data, long len);
 void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
-                    pem_password_cb *cb, void *u);
+    pem_password_cb *cb, void *u);
 int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
-                   const void *x, const EVP_CIPHER *enc,
-                   const unsigned char *kstr, int klen,
-                   pem_password_cb *callback, void *u);
+    const void *x, const EVP_CIPHER *enc,
+    const unsigned char *kstr, int klen,
+    pem_password_cb *callback, void *u);
 STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
-                                        pem_password_cb *cb, void *u);
+    pem_password_cb *cb, void *u);
 STACK_OF(X509_INFO)
 *PEM_X509_INFO_read_ex(FILE *fp, STACK_OF(X509_INFO) *sk, pem_password_cb *cb,
-                       void *u, OSSL_LIB_CTX *libctx, const char *propq);
+    void *u, OSSL_LIB_CTX *libctx, const char *propq);
 #endif
 
 int PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
 int PEM_SignUpdate(EVP_MD_CTX *ctx, const unsigned char *d, unsigned int cnt);
 int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                  unsigned int *siglen, EVP_PKEY *pkey);
+    unsigned int *siglen, EVP_PKEY *pkey);
 
 /* The default pem_password_cb that's used internally */
 int PEM_def_callback(char *buf, int num, int rwflag, void *userdata);
 void PEM_proc_type(char *buf, int type);
 void PEM_dek_info(char *buf, const char *type, int len, const char *str);
 
-# include <openssl/symhacks.h>
+#include <openssl/symhacks.h>
 
 DECLARE_PEM_rw(X509, X509)
 DECLARE_PEM_rw(X509_AUX, X509)
@@ -453,77 +453,77 @@ DECLARE_PEM_rw(PKCS7, PKCS7)
 DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
 DECLARE_PEM_rw(PKCS8, X509_SIG)
 DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, RSAPrivateKey, RSA)
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, RSAPublicKey, RSA)
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, RSA_PUBKEY, RSA)
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DSA
 DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, DSAPrivateKey, DSA)
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, DSA_PUBKEY, DSA)
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, DSAparams, DSA)
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_EC
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, ECPKParameters, EC_GROUP)
 DECLARE_PEM_rw_cb_attr(OSSL_DEPRECATEDIN_3_0, ECPrivateKey, EC_KEY)
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, EC_PUBKEY, EC_KEY)
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_DH
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 DECLARE_PEM_rw_attr(OSSL_DEPRECATEDIN_3_0, DHparams, DH)
 DECLARE_PEM_write_attr(OSSL_DEPRECATEDIN_3_0, DHxparams, DH)
-#  endif
-# endif
+#endif
+#endif
 DECLARE_PEM_rw_cb_ex(PrivateKey, EVP_PKEY)
 DECLARE_PEM_rw_ex(PUBKEY, EVP_PKEY)
 
 int PEM_write_bio_PrivateKey_traditional(BIO *bp, const EVP_PKEY *x,
-                                         const EVP_CIPHER *enc,
-                                         const unsigned char *kstr, int klen,
-                                         pem_password_cb *cb, void *u);
+    const EVP_CIPHER *enc,
+    const unsigned char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 
 /* Why do these take a signed char *kstr? */
 int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, const EVP_PKEY *x, int nid,
-                                      const char *kstr, int klen,
-                                      pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 int PEM_write_bio_PKCS8PrivateKey(BIO *, const EVP_PKEY *, const EVP_CIPHER *,
-                                  const char *kstr, int klen,
-                                  pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 int i2d_PKCS8PrivateKey_bio(BIO *bp, const EVP_PKEY *x, const EVP_CIPHER *enc,
-                            const char *kstr, int klen,
-                            pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, const EVP_PKEY *x, int nid,
-                                const char *kstr, int klen,
-                                pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                                  void *u);
+    void *u);
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int i2d_PKCS8PrivateKey_fp(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
-                           const char *kstr, int klen,
-                           pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, const EVP_PKEY *x, int nid,
-                               const char *kstr, int klen,
-                               pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 int PEM_write_PKCS8PrivateKey_nid(FILE *fp, const EVP_PKEY *x, int nid,
-                                  const char *kstr, int klen,
-                                  pem_password_cb *cb, void *u);
+    const char *kstr, int klen,
+    pem_password_cb *cb, void *u);
 
 EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                                 void *u);
+    void *u);
 
 int PEM_write_PKCS8PrivateKey(FILE *fp, const EVP_PKEY *x, const EVP_CIPHER *enc,
-                              const char *kstr, int klen,
-                              pem_password_cb *cd, void *u);
-# endif
+    const char *kstr, int klen,
+    pem_password_cb *cd, void *u);
+#endif
 EVP_PKEY *PEM_read_bio_Parameters_ex(BIO *bp, EVP_PKEY **x,
-                                     OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
 int PEM_write_bio_Parameters(BIO *bp, const EVP_PKEY *x);
 
@@ -535,14 +535,14 @@ int i2b_PrivateKey_bio(BIO *out, const EVP_PKEY *pk);
 int i2b_PublicKey_bio(BIO *out, const EVP_PKEY *pk);
 EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
 EVP_PKEY *b2i_PVK_bio_ex(BIO *in, pem_password_cb *cb, void *u,
-                         OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int i2b_PVK_bio(BIO *out, const EVP_PKEY *pk, int enclevel,
-                pem_password_cb *cb, void *u);
+    pem_password_cb *cb, void *u);
 int i2b_PVK_bio_ex(BIO *out, const EVP_PKEY *pk, int enclevel,
-                   pem_password_cb *cb, void *u,
-                   OSSL_LIB_CTX *libctx, const char *propq);
+    pem_password_cb *cb, void *u,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h
index a8a5325bd4ba..6d3ab2abf889 100644
--- a/include/openssl/pem2.h
+++ b/include/openssl/pem2.h
@@ -8,12 +8,12 @@
  */
 
 #ifndef OPENSSL_PEM2_H
-# define OPENSSL_PEM2_H
-# pragma once
+#define OPENSSL_PEM2_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PEM2_H
-# endif
-# include <openssl/pemerr.h>
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_PEM2_H
+#endif
+#include <openssl/pemerr.h>
 #endif
diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h
index 3530775bdc63..eb3c9a1d94fa 100644
--- a/include/openssl/pemerr.h
+++ b/include/openssl/pemerr.h
@@ -9,51 +9,49 @@
  */
 
 #ifndef OPENSSL_PEMERR_H
-# define OPENSSL_PEMERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_PEMERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * PEM reason codes.
  */
-# define PEM_R_BAD_BASE64_DECODE                          100
-# define PEM_R_BAD_DECRYPT                                101
-# define PEM_R_BAD_END_LINE                               102
-# define PEM_R_BAD_IV_CHARS                               103
-# define PEM_R_BAD_MAGIC_NUMBER                           116
-# define PEM_R_BAD_PASSWORD_READ                          104
-# define PEM_R_BAD_VERSION_NUMBER                         117
-# define PEM_R_BIO_WRITE_FAILURE                          118
-# define PEM_R_CIPHER_IS_NULL                             127
-# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY               115
-# define PEM_R_EXPECTING_DSS_KEY_BLOB                     131
-# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB                 119
-# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB                  120
-# define PEM_R_EXPECTING_RSA_KEY_BLOB                     132
-# define PEM_R_HEADER_TOO_LONG                            128
-# define PEM_R_INCONSISTENT_HEADER                        121
-# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR                 122
-# define PEM_R_KEYBLOB_TOO_SHORT                          123
-# define PEM_R_MISSING_DEK_IV                             129
-# define PEM_R_NOT_DEK_INFO                               105
-# define PEM_R_NOT_ENCRYPTED                              106
-# define PEM_R_NOT_PROC_TYPE                              107
-# define PEM_R_NO_START_LINE                              108
-# define PEM_R_PROBLEMS_GETTING_PASSWORD                  109
-# define PEM_R_PVK_DATA_TOO_SHORT                         124
-# define PEM_R_PVK_TOO_SHORT                              125
-# define PEM_R_READ_KEY                                   111
-# define PEM_R_SHORT_HEADER                               112
-# define PEM_R_UNEXPECTED_DEK_IV                          130
-# define PEM_R_UNSUPPORTED_CIPHER                         113
-# define PEM_R_UNSUPPORTED_ENCRYPTION                     114
-# define PEM_R_UNSUPPORTED_KEY_COMPONENTS                 126
-# define PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE                110
-# define PEM_R_UNSUPPORTED_PVK_KEY_TYPE                   133
+#define PEM_R_BAD_BASE64_DECODE 100
+#define PEM_R_BAD_DECRYPT 101
+#define PEM_R_BAD_END_LINE 102
+#define PEM_R_BAD_IV_CHARS 103
+#define PEM_R_BAD_MAGIC_NUMBER 116
+#define PEM_R_BAD_PASSWORD_READ 104
+#define PEM_R_BAD_VERSION_NUMBER 117
+#define PEM_R_BIO_WRITE_FAILURE 118
+#define PEM_R_CIPHER_IS_NULL 127
+#define PEM_R_ERROR_CONVERTING_PRIVATE_KEY 115
+#define PEM_R_EXPECTING_DSS_KEY_BLOB 131
+#define PEM_R_EXPECTING_PRIVATE_KEY_BLOB 119
+#define PEM_R_EXPECTING_PUBLIC_KEY_BLOB 120
+#define PEM_R_EXPECTING_RSA_KEY_BLOB 132
+#define PEM_R_HEADER_TOO_LONG 128
+#define PEM_R_INCONSISTENT_HEADER 121
+#define PEM_R_KEYBLOB_HEADER_PARSE_ERROR 122
+#define PEM_R_KEYBLOB_TOO_SHORT 123
+#define PEM_R_MISSING_DEK_IV 129
+#define PEM_R_NOT_DEK_INFO 105
+#define PEM_R_NOT_ENCRYPTED 106
+#define PEM_R_NOT_PROC_TYPE 107
+#define PEM_R_NO_START_LINE 108
+#define PEM_R_PROBLEMS_GETTING_PASSWORD 109
+#define PEM_R_PVK_DATA_TOO_SHORT 124
+#define PEM_R_PVK_TOO_SHORT 125
+#define PEM_R_READ_KEY 111
+#define PEM_R_SHORT_HEADER 112
+#define PEM_R_UNEXPECTED_DEK_IV 130
+#define PEM_R_UNSUPPORTED_CIPHER 113
+#define PEM_R_UNSUPPORTED_ENCRYPTION 114
+#define PEM_R_UNSUPPORTED_KEY_COMPONENTS 126
+#define PEM_R_UNSUPPORTED_PUBLIC_KEY_TYPE 110
+#define PEM_R_UNSUPPORTED_PVK_KEY_TYPE 133
 
 #endif
diff --git a/include/openssl/pkcs12.h.in b/include/openssl/pkcs12.h.in
index 097afba368d0..67d0bdb23ae8 100644
--- a/include/openssl/pkcs12.h.in
+++ b/include/openssl/pkcs12.h.in
@@ -9,53 +9,55 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_PKCS12_H
-# define OPENSSL_PKCS12_H
-# pragma once
+#define OPENSSL_PKCS12_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PKCS12_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_PKCS12_H
+#endif
 
-# include <openssl/bio.h>
-# include <openssl/core.h>
-# include <openssl/x509.h>
-# include <openssl/pkcs12err.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/bio.h>
+#include <openssl/core.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs12err.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-# define PKCS12_KEY_ID   1
-# define PKCS12_IV_ID    2
-# define PKCS12_MAC_ID   3
+#define PKCS12_KEY_ID 1
+#define PKCS12_IV_ID 2
+#define PKCS12_MAC_ID 3
 
 /* Default iteration count */
-# ifndef PKCS12_DEFAULT_ITER
-#  define PKCS12_DEFAULT_ITER     PKCS5_DEFAULT_ITER
-# endif
+#ifndef PKCS12_DEFAULT_ITER
+#define PKCS12_DEFAULT_ITER PKCS5_DEFAULT_ITER
+#endif
 
-# define PKCS12_MAC_KEY_LENGTH 20
+#define PKCS12_MAC_KEY_LENGTH 20
 
 /* The macro is expected to be used only internally. Kept for backwards compatibility. */
-# define PKCS12_SALT_LEN 8
+#define PKCS12_SALT_LEN 8
 
 /* It's not clear if these are actually needed... */
-# define PKCS12_key_gen PKCS12_key_gen_utf8
-# define PKCS12_add_friendlyname PKCS12_add_friendlyname_utf8
+#define PKCS12_key_gen PKCS12_key_gen_utf8
+#define PKCS12_add_friendlyname PKCS12_add_friendlyname_utf8
 
 /* MS key usage constants */
 
-# define KEY_EX  0x10
-# define KEY_SIG 0x80
+#define KEY_EX 0x10
+#define KEY_SIG 0x80
 
 typedef struct PKCS12_MAC_DATA_st PKCS12_MAC_DATA;
 
@@ -63,48 +65,50 @@ typedef struct PKCS12_st PKCS12;
 
 typedef struct PKCS12_SAFEBAG_st PKCS12_SAFEBAG;
 
+/* clang-format off */
 {-
     generate_stack_macros("PKCS12_SAFEBAG");
 -}
+/* clang-format on */
 
 typedef struct pkcs12_bag_st PKCS12_BAGS;
 
-# define PKCS12_ERROR    0
-# define PKCS12_OK       1
+#define PKCS12_ERROR 0
+#define PKCS12_OK 1
 
 /* Compatibility macros */
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
 
-# define M_PKCS12_bag_type PKCS12_bag_type
-# define M_PKCS12_cert_bag_type PKCS12_cert_bag_type
-# define M_PKCS12_crl_bag_type PKCS12_cert_bag_type
+#define M_PKCS12_bag_type PKCS12_bag_type
+#define M_PKCS12_cert_bag_type PKCS12_cert_bag_type
+#define M_PKCS12_crl_bag_type PKCS12_cert_bag_type
 
-# define PKCS12_certbag2x509 PKCS12_SAFEBAG_get1_cert
-# define PKCS12_certbag2scrl PKCS12_SAFEBAG_get1_crl
-# define PKCS12_bag_type PKCS12_SAFEBAG_get_nid
-# define PKCS12_cert_bag_type PKCS12_SAFEBAG_get_bag_nid
-# define PKCS12_x5092certbag PKCS12_SAFEBAG_create_cert
-# define PKCS12_x509crl2certbag PKCS12_SAFEBAG_create_crl
-# define PKCS12_MAKE_KEYBAG PKCS12_SAFEBAG_create0_p8inf
-# define PKCS12_MAKE_SHKEYBAG PKCS12_SAFEBAG_create_pkcs8_encrypt
+#define PKCS12_certbag2x509 PKCS12_SAFEBAG_get1_cert
+#define PKCS12_certbag2scrl PKCS12_SAFEBAG_get1_crl
+#define PKCS12_bag_type PKCS12_SAFEBAG_get_nid
+#define PKCS12_cert_bag_type PKCS12_SAFEBAG_get_bag_nid
+#define PKCS12_x5092certbag PKCS12_SAFEBAG_create_cert
+#define PKCS12_x509crl2certbag PKCS12_SAFEBAG_create_crl
+#define PKCS12_MAKE_KEYBAG PKCS12_SAFEBAG_create0_p8inf
+#define PKCS12_MAKE_SHKEYBAG PKCS12_SAFEBAG_create_pkcs8_encrypt
 
 #endif
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag,
-                                                   int attr_nid);
+    int attr_nid);
 #endif
 
 ASN1_TYPE *PKCS8_get_attr(PKCS8_PRIV_KEY_INFO *p8, int attr_nid);
 int PKCS12_mac_present(const PKCS12 *p12);
 void PKCS12_get0_mac(const ASN1_OCTET_STRING **pmac,
-                     const X509_ALGOR **pmacalg,
-                     const ASN1_OCTET_STRING **psalt,
-                     const ASN1_INTEGER **piter,
-                     const PKCS12 *p12);
+    const X509_ALGOR **pmacalg,
+    const ASN1_OCTET_STRING **psalt,
+    const ASN1_INTEGER **piter,
+    const PKCS12 *p12);
 
 const ASN1_TYPE *PKCS12_SAFEBAG_get0_attr(const PKCS12_SAFEBAG *bag,
-                                          int attr_nid);
+    int attr_nid);
 const ASN1_OBJECT *PKCS12_SAFEBAG_get0_type(const PKCS12_SAFEBAG *bag);
 int PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag);
 int PKCS12_SAFEBAG_get_bag_nid(const PKCS12_SAFEBAG *bag);
@@ -126,159 +130,159 @@ PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_secret(int type, int vtype, const unsigned
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_p8inf(PKCS8_PRIV_KEY_INFO *p8);
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create0_pkcs8(X509_SIG *p8);
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt(int pbe_nid,
-                                                    const char *pass,
-                                                    int passlen,
-                                                    unsigned char *salt,
-                                                    int saltlen, int iter,
-                                                    PKCS8_PRIV_KEY_INFO *p8inf);
+    const char *pass,
+    int passlen,
+    unsigned char *salt,
+    int saltlen, int iter,
+    PKCS8_PRIV_KEY_INFO *p8inf);
 PKCS12_SAFEBAG *PKCS12_SAFEBAG_create_pkcs8_encrypt_ex(int pbe_nid,
-                                                       const char *pass,
-                                                       int passlen,
-                                                       unsigned char *salt,
-                                                       int saltlen, int iter,
-                                                       PKCS8_PRIV_KEY_INFO *p8inf,
-                                                       OSSL_LIB_CTX *ctx,
-                                                       const char *propq);
+    const char *pass,
+    int passlen,
+    unsigned char *salt,
+    int saltlen, int iter,
+    PKCS8_PRIV_KEY_INFO *p8inf,
+    OSSL_LIB_CTX *ctx,
+    const char *propq);
 
 PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
-                                         int nid1, int nid2);
+    int nid1, int nid2);
 PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(const X509_SIG *p8, const char *pass,
-                                   int passlen);
+    int passlen);
 PKCS8_PRIV_KEY_INFO *PKCS8_decrypt_ex(const X509_SIG *p8, const char *pass,
-                                      int passlen, OSSL_LIB_CTX *ctx,
-                                      const char *propq);
+    int passlen, OSSL_LIB_CTX *ctx,
+    const char *propq);
 PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(const PKCS12_SAFEBAG *bag,
-                                         const char *pass, int passlen);
+    const char *pass, int passlen);
 PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey_ex(const PKCS12_SAFEBAG *bag,
-                                            const char *pass, int passlen,
-                                            OSSL_LIB_CTX *ctx,
-                                            const char *propq);
+    const char *pass, int passlen,
+    OSSL_LIB_CTX *ctx,
+    const char *propq);
 X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
-                        const char *pass, int passlen, unsigned char *salt,
-                        int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
+    const char *pass, int passlen, unsigned char *salt,
+    int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
 X509_SIG *PKCS8_encrypt_ex(int pbe_nid, const EVP_CIPHER *cipher,
-                           const char *pass, int passlen, unsigned char *salt,
-                           int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8,
-                           OSSL_LIB_CTX *ctx, const char *propq);
+    const char *pass, int passlen, unsigned char *salt,
+    int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8,
+    OSSL_LIB_CTX *ctx, const char *propq);
 X509_SIG *PKCS8_set0_pbe(const char *pass, int passlen,
-                        PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe);
+    PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe);
 X509_SIG *PKCS8_set0_pbe_ex(const char *pass, int passlen,
-                            PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe,
-                            OSSL_LIB_CTX *ctx, const char *propq);
+    PKCS8_PRIV_KEY_INFO *p8inf, X509_ALGOR *pbe,
+    OSSL_LIB_CTX *ctx, const char *propq);
 PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
 STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
 PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
-                             unsigned char *salt, int saltlen, int iter,
-                             STACK_OF(PKCS12_SAFEBAG) *bags);
+    unsigned char *salt, int saltlen, int iter,
+    STACK_OF(PKCS12_SAFEBAG) *bags);
 PKCS7 *PKCS12_pack_p7encdata_ex(int pbe_nid, const char *pass, int passlen,
-                                unsigned char *salt, int saltlen, int iter,
-                                STACK_OF(PKCS12_SAFEBAG) *bags,
-                                OSSL_LIB_CTX *ctx, const char *propq);
+    unsigned char *salt, int saltlen, int iter,
+    STACK_OF(PKCS12_SAFEBAG) *bags,
+    OSSL_LIB_CTX *ctx, const char *propq);
 
 STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
-                                                  int passlen);
+    int passlen);
 
 int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
 STACK_OF(PKCS7) *PKCS12_unpack_authsafes(const PKCS12 *p12);
 
 int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
-                          int namelen);
+    int namelen);
 int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen);
+    int namelen);
 int PKCS12_add_friendlyname_utf8(PKCS12_SAFEBAG *bag, const char *name,
-                                 int namelen);
+    int namelen);
 int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name,
-                           int namelen);
+    int namelen);
 int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
-                                const unsigned char *name, int namelen);
+    const unsigned char *name, int namelen);
 int PKCS12_add1_attr_by_NID(PKCS12_SAFEBAG *bag, int nid, int type,
-                            const unsigned char *bytes, int len);
+    const unsigned char *bytes, int len);
 int PKCS12_add1_attr_by_txt(PKCS12_SAFEBAG *bag, const char *attrname, int type,
-                            const unsigned char *bytes, int len);
+    const unsigned char *bytes, int len);
 int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
 ASN1_TYPE *PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs,
-                               int attr_nid);
+    int attr_nid);
 char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
 const STACK_OF(X509_ATTRIBUTE) *
 PKCS12_SAFEBAG_get0_attrs(const PKCS12_SAFEBAG *bag);
 void PKCS12_SAFEBAG_set0_attrs(PKCS12_SAFEBAG *bag, STACK_OF(X509_ATTRIBUTE) *attrs);
 unsigned char *PKCS12_pbe_crypt(const X509_ALGOR *algor,
-                                const char *pass, int passlen,
-                                const unsigned char *in, int inlen,
-                                unsigned char **data, int *datalen,
-                                int en_de);
+    const char *pass, int passlen,
+    const unsigned char *in, int inlen,
+    unsigned char **data, int *datalen,
+    int en_de);
 unsigned char *PKCS12_pbe_crypt_ex(const X509_ALGOR *algor,
-                                   const char *pass, int passlen,
-                                   const unsigned char *in, int inlen,
-                                   unsigned char **data, int *datalen,
-                                   int en_de, OSSL_LIB_CTX *libctx,
-                                   const char *propq);
+    const char *pass, int passlen,
+    const unsigned char *in, int inlen,
+    unsigned char **data, int *datalen,
+    int en_de, OSSL_LIB_CTX *libctx,
+    const char *propq);
 void *PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
-                              const char *pass, int passlen,
-                              const ASN1_OCTET_STRING *oct, int zbuf);
+    const char *pass, int passlen,
+    const ASN1_OCTET_STRING *oct, int zbuf);
 void *PKCS12_item_decrypt_d2i_ex(const X509_ALGOR *algor, const ASN1_ITEM *it,
-                                 const char *pass, int passlen,
-                                 const ASN1_OCTET_STRING *oct, int zbuf,
-                                 OSSL_LIB_CTX *libctx, 
-                                 const char *propq);
+    const char *pass, int passlen,
+    const ASN1_OCTET_STRING *oct, int zbuf,
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
-                                           const ASN1_ITEM *it,
-                                           const char *pass, int passlen,
-                                           void *obj, int zbuf);
+    const ASN1_ITEM *it,
+    const char *pass, int passlen,
+    void *obj, int zbuf);
 ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt_ex(X509_ALGOR *algor,
-                                              const ASN1_ITEM *it,
-                                              const char *pass, int passlen,
-                                              void *obj, int zbuf,
-                                              OSSL_LIB_CTX *ctx,
-                                              const char *propq);
+    const ASN1_ITEM *it,
+    const char *pass, int passlen,
+    void *obj, int zbuf,
+    OSSL_LIB_CTX *ctx,
+    const char *propq);
 PKCS12 *PKCS12_init(int mode);
 PKCS12 *PKCS12_init_ex(int mode, OSSL_LIB_CTX *ctx, const char *propq);
 
 int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type);
 int PKCS12_key_gen_asc_ex(const char *pass, int passlen, unsigned char *salt,
-                          int saltlen, int id, int iter, int n,
-                          unsigned char *out, const EVP_MD *md_type,
-                          OSSL_LIB_CTX *ctx, const char *propq);
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type,
+    OSSL_LIB_CTX *ctx, const char *propq);
 int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type);
 int PKCS12_key_gen_uni_ex(unsigned char *pass, int passlen, unsigned char *salt,
-                          int saltlen, int id, int iter, int n,
-                          unsigned char *out, const EVP_MD *md_type,
-                          OSSL_LIB_CTX *ctx, const char *propq);
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type,
+    OSSL_LIB_CTX *ctx, const char *propq);
 int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt,
-                        int saltlen, int id, int iter, int n,
-                        unsigned char *out, const EVP_MD *md_type);
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type);
 int PKCS12_key_gen_utf8_ex(const char *pass, int passlen, unsigned char *salt,
-                           int saltlen, int id, int iter, int n,
-                           unsigned char *out, const EVP_MD *md_type,
-                           OSSL_LIB_CTX *ctx, const char *propq);
+    int saltlen, int id, int iter, int n,
+    unsigned char *out, const EVP_MD *md_type,
+    OSSL_LIB_CTX *ctx, const char *propq);
 
 int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                        ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                        const EVP_MD *md_type, int en_de);
+    ASN1_TYPE *param, const EVP_CIPHER *cipher,
+    const EVP_MD *md_type, int en_de);
 int PKCS12_PBE_keyivgen_ex(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                           ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                           const EVP_MD *md_type, int en_de,
-                           OSSL_LIB_CTX *libctx, const char *propq);
+    ASN1_TYPE *param, const EVP_CIPHER *cipher,
+    const EVP_MD *md_type, int en_de,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *mac, unsigned int *maclen);
+    unsigned char *mac, unsigned int *maclen);
 int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
 int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *salt, int saltlen, int iter,
-                   const EVP_MD *md_type);
+    unsigned char *salt, int saltlen, int iter,
+    const EVP_MD *md_type);
 int PKCS12_set_pbmac1_pbkdf2(PKCS12 *p12, const char *pass, int passlen,
-                             unsigned char *salt, int saltlen, int iter,
-                             const EVP_MD *md_type, const char *prf_md_name);
+    unsigned char *salt, int saltlen, int iter,
+    const EVP_MD *md_type, const char *prf_md_name);
 int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
-                     int saltlen, const EVP_MD *md_type);
+    int saltlen, const EVP_MD *md_type);
 unsigned char *OPENSSL_asc2uni(const char *asc, int asclen,
-                               unsigned char **uni, int *unilen);
+    unsigned char **uni, int *unilen);
 char *OPENSSL_uni2asc(const unsigned char *uni, int unilen);
 unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
-                                unsigned char **uni, int *unilen);
+    unsigned char **uni, int *unilen);
 char *OPENSSL_uni2utf8(const unsigned char *uni, int unilen);
 
 DECLARE_ASN1_FUNCTIONS(PKCS12)
@@ -291,53 +295,53 @@ DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
 
 void PKCS12_PBE_add(void);
 int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-                 STACK_OF(X509) **ca);
+    STACK_OF(X509) **ca);
 typedef int PKCS12_create_cb(PKCS12_SAFEBAG *bag, void *cbarg);
 PKCS12 *PKCS12_create(const char *pass, const char *name, EVP_PKEY *pkey,
-                      X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
-                      int iter, int mac_iter, int keytype);
+    X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
+    int iter, int mac_iter, int keytype);
 PKCS12 *PKCS12_create_ex(const char *pass, const char *name, EVP_PKEY *pkey,
-                         X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
-                         int iter, int mac_iter, int keytype,
-                         OSSL_LIB_CTX *ctx, const char *propq);
+    X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
+    int iter, int mac_iter, int keytype,
+    OSSL_LIB_CTX *ctx, const char *propq);
 PKCS12 *PKCS12_create_ex2(const char *pass, const char *name, EVP_PKEY *pkey,
-                          X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
-                          int iter, int mac_iter, int keytype,
-                          OSSL_LIB_CTX *ctx, const char *propq,
-                          PKCS12_create_cb *cb, void *cbarg);
+    X509 *cert, STACK_OF(X509) *ca, int nid_key, int nid_cert,
+    int iter, int mac_iter, int keytype,
+    OSSL_LIB_CTX *ctx, const char *propq,
+    PKCS12_create_cb *cb, void *cbarg);
 
 PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
 PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                               EVP_PKEY *key, int key_usage, int iter,
-                               int key_nid, const char *pass);
+    EVP_PKEY *key, int key_usage, int iter,
+    int key_nid, const char *pass);
 PKCS12_SAFEBAG *PKCS12_add_key_ex(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                                  EVP_PKEY *key, int key_usage, int iter,
-                                  int key_nid, const char *pass,
-                                  OSSL_LIB_CTX *ctx, const char *propq);
+    EVP_PKEY *key, int key_usage, int iter,
+    int key_nid, const char *pass,
+    OSSL_LIB_CTX *ctx, const char *propq);
 
 PKCS12_SAFEBAG *PKCS12_add_secret(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                                  int nid_type, const unsigned char *value, int len);
+    int nid_type, const unsigned char *value, int len);
 int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                    int safe_nid, int iter, const char *pass);
+    int safe_nid, int iter, const char *pass);
 int PKCS12_add_safe_ex(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                       int safe_nid, int iter, const char *pass,
-                       OSSL_LIB_CTX *ctx, const char *propq);
+    int safe_nid, int iter, const char *pass,
+    OSSL_LIB_CTX *ctx, const char *propq);
 
 PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
 PKCS12 *PKCS12_add_safes_ex(STACK_OF(PKCS7) *safes, int p7_nid,
-                            OSSL_LIB_CTX *ctx, const char *propq);
+    OSSL_LIB_CTX *ctx, const char *propq);
 
 int i2d_PKCS12_bio(BIO *bp, const PKCS12 *p12);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int i2d_PKCS12_fp(FILE *fp, const PKCS12 *p12);
-# endif
+#endif
 PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
-# endif
+#endif
 int PKCS12_newpass(PKCS12 *p12, const char *oldpass, const char *newpass);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index abce3736289b..2ad38f88ff5d 100644
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@@ -9,38 +9,36 @@
  */
 
 #ifndef OPENSSL_PKCS12ERR_H
-# define OPENSSL_PKCS12ERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_PKCS12ERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * PKCS12 reason codes.
  */
-# define PKCS12_R_CALLBACK_FAILED                         115
-# define PKCS12_R_CANT_PACK_STRUCTURE                     100
-# define PKCS12_R_CONTENT_TYPE_NOT_DATA                   121
-# define PKCS12_R_DECODE_ERROR                            101
-# define PKCS12_R_ENCODE_ERROR                            102
-# define PKCS12_R_ENCRYPT_ERROR                           103
-# define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE       120
-# define PKCS12_R_INVALID_NULL_ARGUMENT                   104
-# define PKCS12_R_INVALID_NULL_PKCS12_POINTER             105
-# define PKCS12_R_INVALID_TYPE                            112
-# define PKCS12_R_IV_GEN_ERROR                            106
-# define PKCS12_R_KEY_GEN_ERROR                           107
-# define PKCS12_R_MAC_ABSENT                              108
-# define PKCS12_R_MAC_GENERATION_ERROR                    109
-# define PKCS12_R_MAC_SETUP_ERROR                         110
-# define PKCS12_R_MAC_STRING_SET_ERROR                    111
-# define PKCS12_R_MAC_VERIFY_FAILURE                      113
-# define PKCS12_R_PARSE_ERROR                             114
-# define PKCS12_R_PKCS12_CIPHERFINAL_ERROR                116
-# define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM                118
-# define PKCS12_R_UNSUPPORTED_PKCS12_MODE                 119
+#define PKCS12_R_CALLBACK_FAILED 115
+#define PKCS12_R_CANT_PACK_STRUCTURE 100
+#define PKCS12_R_CONTENT_TYPE_NOT_DATA 121
+#define PKCS12_R_DECODE_ERROR 101
+#define PKCS12_R_ENCODE_ERROR 102
+#define PKCS12_R_ENCRYPT_ERROR 103
+#define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE 120
+#define PKCS12_R_INVALID_NULL_ARGUMENT 104
+#define PKCS12_R_INVALID_NULL_PKCS12_POINTER 105
+#define PKCS12_R_INVALID_TYPE 112
+#define PKCS12_R_IV_GEN_ERROR 106
+#define PKCS12_R_KEY_GEN_ERROR 107
+#define PKCS12_R_MAC_ABSENT 108
+#define PKCS12_R_MAC_GENERATION_ERROR 109
+#define PKCS12_R_MAC_SETUP_ERROR 110
+#define PKCS12_R_MAC_STRING_SET_ERROR 111
+#define PKCS12_R_MAC_VERIFY_FAILURE 113
+#define PKCS12_R_PARSE_ERROR 114
+#define PKCS12_R_PKCS12_CIPHERFINAL_ERROR 116
+#define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM 118
+#define PKCS12_R_UNSUPPORTED_PKCS12_MODE 119
 
 #endif
diff --git a/include/openssl/pkcs7.h.in b/include/openssl/pkcs7.h.in
index 57e45dc2fb6d..1d57255ae747 100644
--- a/include/openssl/pkcs7.h.in
+++ b/include/openssl/pkcs7.h.in
@@ -9,35 +9,36 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_PKCS7_H
-# define OPENSSL_PKCS7_H
-# pragma once
+#define OPENSSL_PKCS7_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_PKCS7_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_PKCS7_H
+#endif
 
-# include <openssl/asn1.h>
-# include <openssl/bio.h>
-# include <openssl/e_os2.h>
+#include <openssl/asn1.h>
+#include <openssl/bio.h>
+#include <openssl/e_os2.h>
 
-# include <openssl/symhacks.h>
-# include <openssl/types.h>
-# include <openssl/pkcs7err.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/symhacks.h>
+#include <openssl/types.h>
+#include <openssl/pkcs7err.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-
 /*-
 Encryption_ID           DES-CBC
 Digest_ID               MD5
@@ -56,7 +57,7 @@ typedef struct pkcs7_issuer_and_serial_st {
 } PKCS7_ISSUER_AND_SERIAL;
 
 typedef struct pkcs7_signer_info_st {
-    ASN1_INTEGER *version;      /* version 1 */
+    ASN1_INTEGER *version; /* version 1 */
     PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
     X509_ALGOR *digest_alg;
     STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
@@ -67,28 +68,31 @@ typedef struct pkcs7_signer_info_st {
     EVP_PKEY *pkey;
     const PKCS7_CTX *ctx;
 } PKCS7_SIGNER_INFO;
+/* clang-format off */
 {-
     generate_stack_macros("PKCS7_SIGNER_INFO");
 -}
+/* clang-format on */
 
 typedef struct pkcs7_recip_info_st {
-    ASN1_INTEGER *version;      /* version 0 */
+    ASN1_INTEGER *version; /* version 0 */
     PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
     X509_ALGOR *key_enc_algor;
     ASN1_OCTET_STRING *enc_key;
-    X509 *cert;                 /* get the pub-key from this */
+    X509 *cert; /* get the pub-key from this */
     const PKCS7_CTX *ctx;
 } PKCS7_RECIP_INFO;
+/* clang-format off */
 {-
     generate_stack_macros("PKCS7_RECIP_INFO");
 -}
-
+/* clang-format on */
 
 typedef struct pkcs7_signed_st {
-    ASN1_INTEGER *version;      /* version 1 */
+    ASN1_INTEGER *version; /* version 1 */
     STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /* [ 0 ] */ /* name should be 'certificates' */
-    STACK_OF(X509_CRL) *crl;    /* [ 1 ] */ /* name should be 'crls' */
+    STACK_OF(X509) *cert; /* [ 0 ] */ /* name should be 'certificates' */
+    STACK_OF(X509_CRL) *crl; /* [ 1 ] */ /* name should be 'crls' */
     STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
     struct pkcs7_st *contents;
 } PKCS7_SIGNED;
@@ -106,30 +110,30 @@ typedef struct pkcs7_enc_content_st {
 } PKCS7_ENC_CONTENT;
 
 typedef struct pkcs7_enveloped_st {
-    ASN1_INTEGER *version;      /* version 0 */
+    ASN1_INTEGER *version; /* version 0 */
     STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
     PKCS7_ENC_CONTENT *enc_data;
 } PKCS7_ENVELOPE;
 
 typedef struct pkcs7_signedandenveloped_st {
-    ASN1_INTEGER *version;      /* version 1 */
+    ASN1_INTEGER *version; /* version 1 */
     STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /* [ 0 ] */ /* name should be 'certificates' */
-    STACK_OF(X509_CRL) *crl;    /* [ 1 ] */ /* name should be 'crls' */
+    STACK_OF(X509) *cert; /* [ 0 ] */ /* name should be 'certificates' */
+    STACK_OF(X509_CRL) *crl; /* [ 1 ] */ /* name should be 'crls' */
     STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
     PKCS7_ENC_CONTENT *enc_data;
     STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
 } PKCS7_SIGN_ENVELOPE;
 
 typedef struct pkcs7_digest_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    X509_ALGOR *md;             /* md used */
+    ASN1_INTEGER *version; /* version 0 */
+    X509_ALGOR *md; /* md used */
     struct pkcs7_st *contents;
     ASN1_OCTET_STRING *digest;
 } PKCS7_DIGEST;
 
 typedef struct pkcs7_encrypted_st {
-    ASN1_INTEGER *version;      /* version 0 */
+    ASN1_INTEGER *version; /* version 0 */
     PKCS7_ENC_CONTENT *enc_data;
 } PKCS7_ENCRYPT;
 
@@ -140,10 +144,10 @@ typedef struct pkcs7_st {
      */
     unsigned char *asn1;
     long length;
-# define PKCS7_S_HEADER  0
-# define PKCS7_S_BODY    1
-# define PKCS7_S_TAIL    2
-    int state;                  /* used during processing */
+#define PKCS7_S_HEADER 0
+#define PKCS7_S_BODY 1
+#define PKCS7_S_TAIL 2
+    int state; /* used during processing */
     int detached;
     ASN1_OBJECT *type;
     /* content as defined by the type */
@@ -170,76 +174,77 @@ typedef struct pkcs7_st {
     } d;
     PKCS7_CTX ctx;
 } PKCS7;
+/* clang-format off */
 {-
     generate_stack_macros("PKCS7");
 -}
+/* clang-format on */
 
+#define PKCS7_OP_SET_DETACHED_SIGNATURE 1
+#define PKCS7_OP_GET_DETACHED_SIGNATURE 2
 
-# define PKCS7_OP_SET_DETACHED_SIGNATURE 1
-# define PKCS7_OP_GET_DETACHED_SIGNATURE 2
+#define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
+#define PKCS7_get_attributes(si) ((si)->unauth_attr)
 
-# define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
-# define PKCS7_get_attributes(si)        ((si)->unauth_attr)
+#define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
+#define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
+#define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
+#define PKCS7_type_is_signedAndEnveloped(a) \
+    (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
+#define PKCS7_type_is_data(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
+#define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
 
-# define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
-# define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-# define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
-# define PKCS7_type_is_signedAndEnveloped(a) \
-                (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
-# define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
-# define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
+#define PKCS7_set_detached(p, v) \
+    PKCS7_ctrl(p, PKCS7_OP_SET_DETACHED_SIGNATURE, v, NULL)
+#define PKCS7_get_detached(p) \
+    PKCS7_ctrl(p, PKCS7_OP_GET_DETACHED_SIGNATURE, 0, NULL)
 
-# define PKCS7_set_detached(p,v) \
-                PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
-# define PKCS7_get_detached(p) \
-                PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
-
-# define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
+#define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
 
 /* S/MIME related flags */
 
-# define PKCS7_TEXT              0x1
-# define PKCS7_NOCERTS           0x2
-# define PKCS7_NOSIGS            0x4
-# define PKCS7_NOCHAIN           0x8
-# define PKCS7_NOINTERN          0x10
-# define PKCS7_NOVERIFY          0x20
-# define PKCS7_DETACHED          0x40
-# define PKCS7_BINARY            0x80
-# define PKCS7_NOATTR            0x100
-# define PKCS7_NOSMIMECAP        0x200
-# define PKCS7_NOOLDMIMETYPE     0x400
-# define PKCS7_CRLFEOL           0x800
-# define PKCS7_STREAM            0x1000
-# define PKCS7_NOCRL             0x2000
-# define PKCS7_PARTIAL           0x4000
-# define PKCS7_REUSE_DIGEST      0x8000
-# define PKCS7_NO_DUAL_CONTENT   0x10000
+#define PKCS7_TEXT 0x1
+#define PKCS7_NOCERTS 0x2
+#define PKCS7_NOSIGS 0x4
+#define PKCS7_NOCHAIN 0x8
+#define PKCS7_NOINTERN 0x10
+#define PKCS7_NOVERIFY 0x20
+#define PKCS7_DETACHED 0x40
+#define PKCS7_BINARY 0x80
+#define PKCS7_NOATTR 0x100
+#define PKCS7_NOSMIMECAP 0x200
+#define PKCS7_NOOLDMIMETYPE 0x400
+#define PKCS7_CRLFEOL 0x800
+#define PKCS7_STREAM 0x1000
+#define PKCS7_NOCRL 0x2000
+#define PKCS7_PARTIAL 0x4000
+#define PKCS7_REUSE_DIGEST 0x8000
+#define PKCS7_NO_DUAL_CONTENT 0x10000
 
 /* Flags: for compatibility with older code */
 
-# define SMIME_TEXT      PKCS7_TEXT
-# define SMIME_NOCERTS   PKCS7_NOCERTS
-# define SMIME_NOSIGS    PKCS7_NOSIGS
-# define SMIME_NOCHAIN   PKCS7_NOCHAIN
-# define SMIME_NOINTERN  PKCS7_NOINTERN
-# define SMIME_NOVERIFY  PKCS7_NOVERIFY
-# define SMIME_DETACHED  PKCS7_DETACHED
-# define SMIME_BINARY    PKCS7_BINARY
-# define SMIME_NOATTR    PKCS7_NOATTR
+#define SMIME_TEXT PKCS7_TEXT
+#define SMIME_NOCERTS PKCS7_NOCERTS
+#define SMIME_NOSIGS PKCS7_NOSIGS
+#define SMIME_NOCHAIN PKCS7_NOCHAIN
+#define SMIME_NOINTERN PKCS7_NOINTERN
+#define SMIME_NOVERIFY PKCS7_NOVERIFY
+#define SMIME_DETACHED PKCS7_DETACHED
+#define SMIME_BINARY PKCS7_BINARY
+#define SMIME_NOATTR PKCS7_NOATTR
 
 /* CRLF ASCII canonicalisation */
-# define SMIME_ASCIICRLF         0x80000
+#define SMIME_ASCIICRLF 0x80000
 
 DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
 
 int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
-                                   const EVP_MD *type, unsigned char *md,
-                                   unsigned int *len);
-# ifndef OPENSSL_NO_STDIO
+    const EVP_MD *type, unsigned char *md,
+    unsigned int *len);
+#ifndef OPENSSL_NO_STDIO
 PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7);
 int i2d_PKCS7_fp(FILE *fp, const PKCS7 *p7);
-# endif
+#endif
 DECLARE_ASN1_DUP_FUNCTION(PKCS7)
 PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7);
 int i2d_PKCS7_bio(BIO *bp, const PKCS7 *p7);
@@ -270,30 +275,30 @@ int PKCS7_set_type(PKCS7 *p7, int type);
 int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
 int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
 int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-                          const EVP_MD *dgst);
+    const EVP_MD *dgst);
 int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si);
 int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
 int PKCS7_add_certificate(PKCS7 *p7, X509 *cert);
 int PKCS7_add_crl(PKCS7 *p7, X509_CRL *crl);
 int PKCS7_content_new(PKCS7 *p7, int nid);
 int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
-                     BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
+    BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
 int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                          X509 *signer);
+    X509 *signer);
 
 BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
 int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
 BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
 
 PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
-                                       EVP_PKEY *pkey, const EVP_MD *dgst);
+    EVP_PKEY *pkey, const EVP_MD *dgst);
 X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
 int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md);
 STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
 
 PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
 void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
-                                 X509_ALGOR **pdig, X509_ALGOR **psig);
+    X509_ALGOR **pdig, X509_ALGOR **psig);
 void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
 int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
 int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
@@ -304,48 +309,48 @@ PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
 ASN1_OCTET_STRING *PKCS7_get_octet_string(PKCS7 *p7);
 ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
 int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type,
-                               void *data);
+    void *data);
 int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-                        void *value);
+    void *value);
 ASN1_TYPE *PKCS7_get_attribute(const PKCS7_SIGNER_INFO *si, int nid);
 ASN1_TYPE *PKCS7_get_signed_attribute(const PKCS7_SIGNER_INFO *si, int nid);
 int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk);
+    STACK_OF(X509_ATTRIBUTE) *sk);
 int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
-                         STACK_OF(X509_ATTRIBUTE) *sk);
+    STACK_OF(X509_ATTRIBUTE) *sk);
 
 PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                  BIO *data, int flags);
+    BIO *data, int flags);
 PKCS7 *PKCS7_sign_ex(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                     BIO *data, int flags, OSSL_LIB_CTX *libctx,
-                     const char *propq);
+    BIO *data, int flags, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
 PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
-                                         X509 *signcert, EVP_PKEY *pkey,
-                                         const EVP_MD *md, int flags);
+    X509 *signcert, EVP_PKEY *pkey,
+    const EVP_MD *md, int flags);
 
 int PKCS7_final(PKCS7 *p7, BIO *data, int flags);
 int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
-                 BIO *indata, BIO *out, int flags);
+    BIO *indata, BIO *out, int flags);
 STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
-                                   int flags);
+    int flags);
 PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
-                     int flags);
+    int flags);
 PKCS7 *PKCS7_encrypt_ex(STACK_OF(X509) *certs, BIO *in,
-                        const EVP_CIPHER *cipher, int flags,
-                        OSSL_LIB_CTX *libctx, const char *propq);
+    const EVP_CIPHER *cipher, int flags,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data,
-                  int flags);
+    int flags);
 
 int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
-                              STACK_OF(X509_ALGOR) *cap);
+    STACK_OF(X509_ALGOR) *cap);
 STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
 int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
 
 int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid);
 int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t);
 int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
-                             const unsigned char *md, int mdlen);
+    const unsigned char *md, int mdlen);
 
 int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
 PKCS7 *SMIME_read_PKCS7_ex(BIO *bio, BIO **bcont, PKCS7 **p7);
@@ -353,7 +358,7 @@ PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
 
 BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h
index ceb1a5019867..358fe1018fb2 100644
--- a/include/openssl/pkcs7err.h
+++ b/include/openssl/pkcs7err.h
@@ -9,55 +9,53 @@
  */
 
 #ifndef OPENSSL_PKCS7ERR_H
-# define OPENSSL_PKCS7ERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_PKCS7ERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * PKCS7 reason codes.
  */
-# define PKCS7_R_CERTIFICATE_VERIFY_ERROR                 117
-# define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER          144
-# define PKCS7_R_CIPHER_NOT_INITIALIZED                   116
-# define PKCS7_R_CONTENT_AND_DATA_PRESENT                 118
-# define PKCS7_R_CTRL_ERROR                               152
-# define PKCS7_R_DECRYPT_ERROR                            119
-# define PKCS7_R_DIGEST_FAILURE                           101
-# define PKCS7_R_ENCRYPTION_CTRL_FAILURE                  149
-# define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
-# define PKCS7_R_ERROR_ADDING_RECIPIENT                   120
-# define PKCS7_R_ERROR_SETTING_CIPHER                     121
-# define PKCS7_R_INVALID_NULL_POINTER                     143
-# define PKCS7_R_INVALID_SIGNED_DATA_TYPE                 155
-# define PKCS7_R_NO_CONTENT                               122
-# define PKCS7_R_NO_DEFAULT_DIGEST                        151
-# define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND            154
-# define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE         115
-# define PKCS7_R_NO_SIGNATURES_ON_DATA                    123
-# define PKCS7_R_NO_SIGNERS                               142
-# define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     104
-# define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR                124
-# define PKCS7_R_PKCS7_ADD_SIGNER_ERROR                   153
-# define PKCS7_R_PKCS7_DATASIGN                           145
-# define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE   127
-# define PKCS7_R_SIGNATURE_FAILURE                        105
-# define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND             128
-# define PKCS7_R_SIGNING_CTRL_FAILURE                     147
-# define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE  148
-# define PKCS7_R_SMIME_TEXT_ERROR                         129
-# define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               106
-# define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   107
-# define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            108
-# define PKCS7_R_UNKNOWN_DIGEST_TYPE                      109
-# define PKCS7_R_UNKNOWN_OPERATION                        110
-# define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  111
-# define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 112
-# define PKCS7_R_WRONG_CONTENT_TYPE                       113
-# define PKCS7_R_WRONG_PKCS7_TYPE                         114
+#define PKCS7_R_CERTIFICATE_VERIFY_ERROR 117
+#define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER 144
+#define PKCS7_R_CIPHER_NOT_INITIALIZED 116
+#define PKCS7_R_CONTENT_AND_DATA_PRESENT 118
+#define PKCS7_R_CTRL_ERROR 152
+#define PKCS7_R_DECRYPT_ERROR 119
+#define PKCS7_R_DIGEST_FAILURE 101
+#define PKCS7_R_ENCRYPTION_CTRL_FAILURE 149
+#define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
+#define PKCS7_R_ERROR_ADDING_RECIPIENT 120
+#define PKCS7_R_ERROR_SETTING_CIPHER 121
+#define PKCS7_R_INVALID_NULL_POINTER 143
+#define PKCS7_R_INVALID_SIGNED_DATA_TYPE 155
+#define PKCS7_R_NO_CONTENT 122
+#define PKCS7_R_NO_DEFAULT_DIGEST 151
+#define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND 154
+#define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE 115
+#define PKCS7_R_NO_SIGNATURES_ON_DATA 123
+#define PKCS7_R_NO_SIGNERS 142
+#define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE 104
+#define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR 124
+#define PKCS7_R_PKCS7_ADD_SIGNER_ERROR 153
+#define PKCS7_R_PKCS7_DATASIGN 145
+#define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 127
+#define PKCS7_R_SIGNATURE_FAILURE 105
+#define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND 128
+#define PKCS7_R_SIGNING_CTRL_FAILURE 147
+#define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 148
+#define PKCS7_R_SMIME_TEXT_ERROR 129
+#define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE 106
+#define PKCS7_R_UNABLE_TO_FIND_MEM_BIO 107
+#define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST 108
+#define PKCS7_R_UNKNOWN_DIGEST_TYPE 109
+#define PKCS7_R_UNKNOWN_OPERATION 110
+#define PKCS7_R_UNSUPPORTED_CIPHER_TYPE 111
+#define PKCS7_R_UNSUPPORTED_CONTENT_TYPE 112
+#define PKCS7_R_WRONG_CONTENT_TYPE 113
+#define PKCS7_R_WRONG_PKCS7_TYPE 114
 
 #endif
diff --git a/include/openssl/prov_ssl.h b/include/openssl/prov_ssl.h
index 76d01e1eb89c..269c3b805737 100644
--- a/include/openssl/prov_ssl.h
+++ b/include/openssl/prov_ssl.h
@@ -8,31 +8,31 @@
  */
 
 #ifndef OPENSSL_PROV_SSL_H
-# define OPENSSL_PROV_SSL_H
-# pragma once
+#define OPENSSL_PROV_SSL_H
+#pragma once
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /* SSL/TLS related defines useful to providers */
 
-# define SSL_MAX_MASTER_KEY_LENGTH 48
+#define SSL_MAX_MASTER_KEY_LENGTH 48
 
 /* SSL/TLS uses a 2 byte unsigned version number */
-# define SSL3_VERSION                    0x0300
-# define TLS1_VERSION                    0x0301
-# define TLS1_1_VERSION                  0x0302
-# define TLS1_2_VERSION                  0x0303
-# define TLS1_3_VERSION                  0x0304
-# define DTLS1_VERSION                   0xFEFF
-# define DTLS1_2_VERSION                 0xFEFD
-# define DTLS1_BAD_VER                   0x0100
+#define SSL3_VERSION 0x0300
+#define TLS1_VERSION 0x0301
+#define TLS1_1_VERSION 0x0302
+#define TLS1_2_VERSION 0x0303
+#define TLS1_3_VERSION 0x0304
+#define DTLS1_VERSION 0xFEFF
+#define DTLS1_2_VERSION 0xFEFD
+#define DTLS1_BAD_VER 0x0100
 
 /* QUIC uses a 4 byte unsigned version number */
-# define OSSL_QUIC1_VERSION              0x0000001
+#define OSSL_QUIC1_VERSION 0x0000001
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif /* OPENSSL_PROV_SSL_H */
diff --git a/include/openssl/proverr.h b/include/openssl/proverr.h
index 10bcd427800f..3dff4b75482f 100644
--- a/include/openssl/proverr.h
+++ b/include/openssl/proverr.h
@@ -9,162 +9,160 @@
  */
 
 #ifndef OPENSSL_PROVERR_H
-# define OPENSSL_PROVERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_PROVERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * PROV reason codes.
  */
-# define PROV_R_ADDITIONAL_INPUT_TOO_LONG                 184
-# define PROV_R_ALGORITHM_MISMATCH                        173
-# define PROV_R_ALREADY_INSTANTIATED                      185
-# define PROV_R_BAD_DECRYPT                               100
-# define PROV_R_BAD_ENCODING                              141
-# define PROV_R_BAD_LENGTH                                142
-# define PROV_R_BAD_TLS_CLIENT_VERSION                    161
-# define PROV_R_BN_ERROR                                  160
-# define PROV_R_CIPHER_OPERATION_FAILED                   102
-# define PROV_R_COFACTOR_REQUIRED                         236
-# define PROV_R_DERIVATION_FUNCTION_INIT_FAILED           205
-# define PROV_R_DIGEST_NOT_ALLOWED                        174
-# define PROV_R_EMS_NOT_ENABLED                           233
-# define PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS    244
-# define PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK          186
-# define PROV_R_ERROR_INSTANTIATING_DRBG                  188
-# define PROV_R_ERROR_RETRIEVING_ENTROPY                  189
-# define PROV_R_ERROR_RETRIEVING_NONCE                    190
-# define PROV_R_FAILED_DURING_DERIVATION                  164
-# define PROV_R_FAILED_TO_CREATE_LOCK                     180
-# define PROV_R_FAILED_TO_DECRYPT                         162
-# define PROV_R_FAILED_TO_GENERATE_KEY                    121
-# define PROV_R_FAILED_TO_GET_PARAMETER                   103
-# define PROV_R_FAILED_TO_SET_PARAMETER                   104
-# define PROV_R_FAILED_TO_SIGN                            175
-# define PROV_R_FINAL_CALL_OUT_OF_ORDER                   237
-# define PROV_R_FIPS_MODULE_CONDITIONAL_ERROR             227
-# define PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE          224
-# define PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR              253
-# define PROV_R_FIPS_MODULE_IN_ERROR_STATE                225
-# define PROV_R_GENERATE_ERROR                            191
-# define PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE       165
-# define PROV_R_INDICATOR_INTEGRITY_FAILURE               210
-# define PROV_R_INIT_CALL_OUT_OF_ORDER                    238
-# define PROV_R_INSUFFICIENT_DRBG_STRENGTH                181
-# define PROV_R_INVALID_AAD                               108
-# define PROV_R_INVALID_AEAD                              231
-# define PROV_R_INVALID_CONFIG_DATA                       211
-# define PROV_R_INVALID_CONSTANT_LENGTH                   157
-# define PROV_R_INVALID_CURVE                             176
-# define PROV_R_INVALID_CUSTOM_LENGTH                     111
-# define PROV_R_INVALID_DATA                              115
-# define PROV_R_INVALID_DIGEST                            122
-# define PROV_R_INVALID_DIGEST_LENGTH                     166
-# define PROV_R_INVALID_DIGEST_SIZE                       218
-# define PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION 243
-# define PROV_R_INVALID_INPUT_LENGTH                      230
-# define PROV_R_INVALID_ITERATION_COUNT                   123
-# define PROV_R_INVALID_IV_LENGTH                         109
-# define PROV_R_INVALID_KDF                               232
-# define PROV_R_INVALID_KEY                               158
-# define PROV_R_INVALID_KEY_LENGTH                        105
-# define PROV_R_INVALID_MAC                               151
-# define PROV_R_INVALID_MEMORY_SIZE                       235
-# define PROV_R_INVALID_MGF1_MD                           167
-# define PROV_R_INVALID_MODE                              125
-# define PROV_R_INVALID_OUTPUT_LENGTH                     217
-# define PROV_R_INVALID_PADDING_MODE                      168
-# define PROV_R_INVALID_PREHASHED_DIGEST_LENGTH           241
-# define PROV_R_INVALID_PUBINFO                           198
-# define PROV_R_INVALID_SALT_LENGTH                       112
-# define PROV_R_INVALID_SEED_LENGTH                       154
-# define PROV_R_INVALID_SIGNATURE_SIZE                    179
-# define PROV_R_INVALID_STATE                             212
-# define PROV_R_INVALID_TAG                               110
-# define PROV_R_INVALID_TAG_LENGTH                        118
-# define PROV_R_INVALID_THREAD_POOL_SIZE                  234
-# define PROV_R_INVALID_UKM_LENGTH                        200
-# define PROV_R_INVALID_X931_DIGEST                       170
-# define PROV_R_IN_ERROR_STATE                            192
-# define PROV_R_KEY_SETUP_FAILED                          101
-# define PROV_R_KEY_SIZE_TOO_SMALL                        171
-# define PROV_R_LENGTH_TOO_LARGE                          202
-# define PROV_R_MISMATCHING_DOMAIN_PARAMETERS             203
-# define PROV_R_MISSING_CEK_ALG                           144
-# define PROV_R_MISSING_CIPHER                            155
-# define PROV_R_MISSING_CONFIG_DATA                       213
-# define PROV_R_MISSING_CONSTANT                          156
-# define PROV_R_MISSING_KEY                               128
-# define PROV_R_MISSING_MAC                               150
-# define PROV_R_MISSING_MESSAGE_DIGEST                    129
-# define PROV_R_MISSING_OID                               209
-# define PROV_R_MISSING_PASS                              130
-# define PROV_R_MISSING_SALT                              131
-# define PROV_R_MISSING_SECRET                            132
-# define PROV_R_MISSING_SEED                              140
-# define PROV_R_MISSING_SESSION_ID                        133
-# define PROV_R_MISSING_TYPE                              134
-# define PROV_R_MISSING_XCGHASH                           135
-# define PROV_R_ML_DSA_NO_FORMAT                          245
-# define PROV_R_ML_KEM_NO_FORMAT                          246
-# define PROV_R_MODULE_INTEGRITY_FAILURE                  214
-# define PROV_R_NOT_A_PRIVATE_KEY                         221
-# define PROV_R_NOT_A_PUBLIC_KEY                          220
-# define PROV_R_NOT_INSTANTIATED                          193
-# define PROV_R_NOT_PARAMETERS                            226
-# define PROV_R_NOT_SUPPORTED                             136
-# define PROV_R_NOT_XOF_OR_INVALID_LENGTH                 113
-# define PROV_R_NO_INSTANCE_ALLOWED                       242
-# define PROV_R_NO_KEY_SET                                114
-# define PROV_R_NO_PARAMETERS_SET                         177
-# define PROV_R_NULL_LENGTH_POINTER                       247
-# define PROV_R_NULL_OUTPUT_BUFFER                        248
-# define PROV_R_ONESHOT_CALL_OUT_OF_ORDER                 239
-# define PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE  178
-# define PROV_R_OUTPUT_BUFFER_TOO_SMALL                   106
-# define PROV_R_PARENT_CANNOT_GENERATE_RANDOM_NUMBERS     228
-# define PROV_R_PARENT_CANNOT_SUPPLY_ENTROPY_SEED         187
-# define PROV_R_PARENT_LOCKING_NOT_ENABLED                182
-# define PROV_R_PARENT_STRENGTH_TOO_WEAK                  194
-# define PROV_R_PATH_MUST_BE_ABSOLUTE                     219
-# define PROV_R_PERSONALISATION_STRING_TOO_LONG           195
-# define PROV_R_PSS_SALTLEN_TOO_SMALL                     172
-# define PROV_R_REQUEST_TOO_LARGE_FOR_DRBG                196
-# define PROV_R_REQUIRE_CTR_MODE_CIPHER                   206
-# define PROV_R_RESEED_ERROR                              197
-# define PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES     222
-# define PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT       229
-# define PROV_R_SELF_TEST_KAT_FAILURE                     215
-# define PROV_R_SELF_TEST_POST_FAILURE                    216
-# define PROV_R_TAG_NOT_NEEDED                            120
-# define PROV_R_TAG_NOT_SET                               119
-# define PROV_R_TOO_MANY_RECORDS                          126
-# define PROV_R_UNABLE_TO_FIND_CIPHERS                    207
-# define PROV_R_UNABLE_TO_GET_PARENT_STRENGTH             199
-# define PROV_R_UNABLE_TO_GET_PASSPHRASE                  159
-# define PROV_R_UNABLE_TO_INITIALISE_CIPHERS              208
-# define PROV_R_UNABLE_TO_LOAD_SHA256                     147
-# define PROV_R_UNABLE_TO_LOCK_PARENT                     201
-# define PROV_R_UNABLE_TO_RESEED                          204
-# define PROV_R_UNEXPECTED_KEY_PARAMETERS                 249
-# define PROV_R_UNSUPPORTED_CEK_ALG                       145
-# define PROV_R_UNSUPPORTED_KEY_SIZE                      153
-# define PROV_R_UNSUPPORTED_MAC_TYPE                      137
-# define PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS              152
-# define PROV_R_UNSUPPORTED_SELECTION                     250
-# define PROV_R_UPDATE_CALL_OUT_OF_ORDER                  240
-# define PROV_R_URI_AUTHORITY_UNSUPPORTED                 223
-# define PROV_R_VALUE_ERROR                               138
-# define PROV_R_WRONG_CIPHERTEXT_SIZE                     251
-# define PROV_R_WRONG_FINAL_BLOCK_LENGTH                  107
-# define PROV_R_WRONG_OUTPUT_BUFFER_SIZE                  139
-# define PROV_R_XOF_DIGESTS_NOT_ALLOWED                   183
-# define PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE                148
-# define PROV_R_XTS_DUPLICATED_KEYS                       149
+#define PROV_R_ADDITIONAL_INPUT_TOO_LONG 184
+#define PROV_R_ALGORITHM_MISMATCH 173
+#define PROV_R_ALREADY_INSTANTIATED 185
+#define PROV_R_BAD_DECRYPT 100
+#define PROV_R_BAD_ENCODING 141
+#define PROV_R_BAD_LENGTH 142
+#define PROV_R_BAD_TLS_CLIENT_VERSION 161
+#define PROV_R_BN_ERROR 160
+#define PROV_R_CIPHER_OPERATION_FAILED 102
+#define PROV_R_COFACTOR_REQUIRED 236
+#define PROV_R_DERIVATION_FUNCTION_INIT_FAILED 205
+#define PROV_R_DIGEST_NOT_ALLOWED 174
+#define PROV_R_EMS_NOT_ENABLED 233
+#define PROV_R_ENTROPY_SOURCE_FAILED_CONTINUOUS_TESTS 244
+#define PROV_R_ENTROPY_SOURCE_STRENGTH_TOO_WEAK 186
+#define PROV_R_ERROR_INSTANTIATING_DRBG 188
+#define PROV_R_ERROR_RETRIEVING_ENTROPY 189
+#define PROV_R_ERROR_RETRIEVING_NONCE 190
+#define PROV_R_FAILED_DURING_DERIVATION 164
+#define PROV_R_FAILED_TO_CREATE_LOCK 180
+#define PROV_R_FAILED_TO_DECRYPT 162
+#define PROV_R_FAILED_TO_GENERATE_KEY 121
+#define PROV_R_FAILED_TO_GET_PARAMETER 103
+#define PROV_R_FAILED_TO_SET_PARAMETER 104
+#define PROV_R_FAILED_TO_SIGN 175
+#define PROV_R_FINAL_CALL_OUT_OF_ORDER 237
+#define PROV_R_FIPS_MODULE_CONDITIONAL_ERROR 227
+#define PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE 224
+#define PROV_R_FIPS_MODULE_IMPORT_PCT_ERROR 253
+#define PROV_R_FIPS_MODULE_IN_ERROR_STATE 225
+#define PROV_R_GENERATE_ERROR 191
+#define PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE 165
+#define PROV_R_INDICATOR_INTEGRITY_FAILURE 210
+#define PROV_R_INIT_CALL_OUT_OF_ORDER 238
+#define PROV_R_INSUFFICIENT_DRBG_STRENGTH 181
+#define PROV_R_INVALID_AAD 108
+#define PROV_R_INVALID_AEAD 231
+#define PROV_R_INVALID_CONFIG_DATA 211
+#define PROV_R_INVALID_CONSTANT_LENGTH 157
+#define PROV_R_INVALID_CURVE 176
+#define PROV_R_INVALID_CUSTOM_LENGTH 111
+#define PROV_R_INVALID_DATA 115
+#define PROV_R_INVALID_DIGEST 122
+#define PROV_R_INVALID_DIGEST_LENGTH 166
+#define PROV_R_INVALID_DIGEST_SIZE 218
+#define PROV_R_INVALID_EDDSA_INSTANCE_FOR_ATTEMPTED_OPERATION 243
+#define PROV_R_INVALID_INPUT_LENGTH 230
+#define PROV_R_INVALID_ITERATION_COUNT 123
+#define PROV_R_INVALID_IV_LENGTH 109
+#define PROV_R_INVALID_KDF 232
+#define PROV_R_INVALID_KEY 158
+#define PROV_R_INVALID_KEY_LENGTH 105
+#define PROV_R_INVALID_MAC 151
+#define PROV_R_INVALID_MEMORY_SIZE 235
+#define PROV_R_INVALID_MGF1_MD 167
+#define PROV_R_INVALID_MODE 125
+#define PROV_R_INVALID_OUTPUT_LENGTH 217
+#define PROV_R_INVALID_PADDING_MODE 168
+#define PROV_R_INVALID_PREHASHED_DIGEST_LENGTH 241
+#define PROV_R_INVALID_PUBINFO 198
+#define PROV_R_INVALID_SALT_LENGTH 112
+#define PROV_R_INVALID_SEED_LENGTH 154
+#define PROV_R_INVALID_SIGNATURE_SIZE 179
+#define PROV_R_INVALID_STATE 212
+#define PROV_R_INVALID_TAG 110
+#define PROV_R_INVALID_TAG_LENGTH 118
+#define PROV_R_INVALID_THREAD_POOL_SIZE 234
+#define PROV_R_INVALID_UKM_LENGTH 200
+#define PROV_R_INVALID_X931_DIGEST 170
+#define PROV_R_IN_ERROR_STATE 192
+#define PROV_R_KEY_SETUP_FAILED 101
+#define PROV_R_KEY_SIZE_TOO_SMALL 171
+#define PROV_R_LENGTH_TOO_LARGE 202
+#define PROV_R_MISMATCHING_DOMAIN_PARAMETERS 203
+#define PROV_R_MISSING_CEK_ALG 144
+#define PROV_R_MISSING_CIPHER 155
+#define PROV_R_MISSING_CONFIG_DATA 213
+#define PROV_R_MISSING_CONSTANT 156
+#define PROV_R_MISSING_KEY 128
+#define PROV_R_MISSING_MAC 150
+#define PROV_R_MISSING_MESSAGE_DIGEST 129
+#define PROV_R_MISSING_OID 209
+#define PROV_R_MISSING_PASS 130
+#define PROV_R_MISSING_SALT 131
+#define PROV_R_MISSING_SECRET 132
+#define PROV_R_MISSING_SEED 140
+#define PROV_R_MISSING_SESSION_ID 133
+#define PROV_R_MISSING_TYPE 134
+#define PROV_R_MISSING_XCGHASH 135
+#define PROV_R_ML_DSA_NO_FORMAT 245
+#define PROV_R_ML_KEM_NO_FORMAT 246
+#define PROV_R_MODULE_INTEGRITY_FAILURE 214
+#define PROV_R_NOT_A_PRIVATE_KEY 221
+#define PROV_R_NOT_A_PUBLIC_KEY 220
+#define PROV_R_NOT_INSTANTIATED 193
+#define PROV_R_NOT_PARAMETERS 226
+#define PROV_R_NOT_SUPPORTED 136
+#define PROV_R_NOT_XOF_OR_INVALID_LENGTH 113
+#define PROV_R_NO_INSTANCE_ALLOWED 242
+#define PROV_R_NO_KEY_SET 114
+#define PROV_R_NO_PARAMETERS_SET 177
+#define PROV_R_NULL_LENGTH_POINTER 247
+#define PROV_R_NULL_OUTPUT_BUFFER 248
+#define PROV_R_ONESHOT_CALL_OUT_OF_ORDER 239
+#define PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 178
+#define PROV_R_OUTPUT_BUFFER_TOO_SMALL 106
+#define PROV_R_PARENT_CANNOT_GENERATE_RANDOM_NUMBERS 228
+#define PROV_R_PARENT_CANNOT_SUPPLY_ENTROPY_SEED 187
+#define PROV_R_PARENT_LOCKING_NOT_ENABLED 182
+#define PROV_R_PARENT_STRENGTH_TOO_WEAK 194
+#define PROV_R_PATH_MUST_BE_ABSOLUTE 219
+#define PROV_R_PERSONALISATION_STRING_TOO_LONG 195
+#define PROV_R_PSS_SALTLEN_TOO_SMALL 172
+#define PROV_R_REQUEST_TOO_LARGE_FOR_DRBG 196
+#define PROV_R_REQUIRE_CTR_MODE_CIPHER 206
+#define PROV_R_RESEED_ERROR 197
+#define PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES 222
+#define PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT 229
+#define PROV_R_SELF_TEST_KAT_FAILURE 215
+#define PROV_R_SELF_TEST_POST_FAILURE 216
+#define PROV_R_TAG_NOT_NEEDED 120
+#define PROV_R_TAG_NOT_SET 119
+#define PROV_R_TOO_MANY_RECORDS 126
+#define PROV_R_UNABLE_TO_FIND_CIPHERS 207
+#define PROV_R_UNABLE_TO_GET_PARENT_STRENGTH 199
+#define PROV_R_UNABLE_TO_GET_PASSPHRASE 159
+#define PROV_R_UNABLE_TO_INITIALISE_CIPHERS 208
+#define PROV_R_UNABLE_TO_LOAD_SHA256 147
+#define PROV_R_UNABLE_TO_LOCK_PARENT 201
+#define PROV_R_UNABLE_TO_RESEED 204
+#define PROV_R_UNEXPECTED_KEY_PARAMETERS 249
+#define PROV_R_UNSUPPORTED_CEK_ALG 145
+#define PROV_R_UNSUPPORTED_KEY_SIZE 153
+#define PROV_R_UNSUPPORTED_MAC_TYPE 137
+#define PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS 152
+#define PROV_R_UNSUPPORTED_SELECTION 250
+#define PROV_R_UPDATE_CALL_OUT_OF_ORDER 240
+#define PROV_R_URI_AUTHORITY_UNSUPPORTED 223
+#define PROV_R_VALUE_ERROR 138
+#define PROV_R_WRONG_CIPHERTEXT_SIZE 251
+#define PROV_R_WRONG_FINAL_BLOCK_LENGTH 107
+#define PROV_R_WRONG_OUTPUT_BUFFER_SIZE 139
+#define PROV_R_XOF_DIGESTS_NOT_ALLOWED 183
+#define PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE 148
+#define PROV_R_XTS_DUPLICATED_KEYS 149
 
 #endif
diff --git a/include/openssl/provider.h b/include/openssl/provider.h
index 514435773b12..c34beea201f2 100644
--- a/include/openssl/provider.h
+++ b/include/openssl/provider.h
@@ -8,14 +8,14 @@
  */
 
 #ifndef OPENSSL_PROVIDER_H
-# define OPENSSL_PROVIDER_H
-# pragma once
+#define OPENSSL_PROVIDER_H
+#pragma once
 
-# include <openssl/core.h>
+#include <openssl/core.h>
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /* Set and Get a library context search path */
 int OSSL_PROVIDER_set_default_search_path(OSSL_LIB_CTX *, const char *path);
@@ -24,25 +24,25 @@ const char *OSSL_PROVIDER_get0_default_search_path(OSSL_LIB_CTX *libctx);
 /* Load and unload a provider */
 OSSL_PROVIDER *OSSL_PROVIDER_load(OSSL_LIB_CTX *, const char *name);
 OSSL_PROVIDER *OSSL_PROVIDER_load_ex(OSSL_LIB_CTX *, const char *name,
-                                     OSSL_PARAM *params);
+    OSSL_PARAM *params);
 OSSL_PROVIDER *OSSL_PROVIDER_try_load(OSSL_LIB_CTX *, const char *name,
-                                      int retain_fallbacks);
+    int retain_fallbacks);
 OSSL_PROVIDER *OSSL_PROVIDER_try_load_ex(OSSL_LIB_CTX *, const char *name,
-                                         OSSL_PARAM *params,
-                                         int retain_fallbacks);
+    OSSL_PARAM *params,
+    int retain_fallbacks);
 int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov);
 int OSSL_PROVIDER_available(OSSL_LIB_CTX *, const char *name);
 int OSSL_PROVIDER_do_all(OSSL_LIB_CTX *ctx,
-                         int (*cb)(OSSL_PROVIDER *provider, void *cbdata),
-                         void *cbdata);
+    int (*cb)(OSSL_PROVIDER *provider, void *cbdata),
+    void *cbdata);
 
 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_self_test(const OSSL_PROVIDER *prov);
 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);
 
 /*-
  * Provider configuration parameters are normally set in the configuration file,
@@ -52,7 +52,7 @@ int OSSL_PROVIDER_get_capabilities(const OSSL_PROVIDER *prov,
  * Only UTF8-string values are supported.
  */
 int OSSL_PROVIDER_add_conf_parameter(OSSL_PROVIDER *prov, const char *name,
-                                     const char *value);
+    const char *value);
 /*
  * Retrieves any of the requested configuration parameters for the given
  * provider that were set in the configuration file or via the above
@@ -62,7 +62,7 @@ int OSSL_PROVIDER_add_conf_parameter(OSSL_PROVIDER *prov, const char *name,
  * returned by reference, not as copies.
  */
 int OSSL_PROVIDER_get_conf_parameters(const OSSL_PROVIDER *prov,
-                                      OSSL_PARAM params[]);
+    OSSL_PARAM params[]);
 /*
  * Parse a provider configuration parameter as a boolean value,
  * or return a default value if unable to retrieve the parameter.
@@ -70,25 +70,25 @@ int OSSL_PROVIDER_get_conf_parameters(const OSSL_PROVIDER *prov,
  * Values like "0", "no", "false", ... are false (zero).
  */
 int OSSL_PROVIDER_conf_get_bool(const OSSL_PROVIDER *prov,
-                                const char *name, int defval);
+    const char *name, int defval);
 
 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);
 void *OSSL_PROVIDER_get0_provider_ctx(const OSSL_PROVIDER *prov);
 const OSSL_DISPATCH *OSSL_PROVIDER_get0_dispatch(const OSSL_PROVIDER *prov);
 
 /* Add a built in providers */
 int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *, const char *name,
-                              OSSL_provider_init_fn *init_fn);
+    OSSL_provider_init_fn *init_fn);
 
 /* Information */
 const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/quic.h b/include/openssl/quic.h
index 8eacc631eb12..657969bc8acb 100644
--- a/include/openssl/quic.h
+++ b/include/openssl/quic.h
@@ -8,17 +8,17 @@
  */
 
 #ifndef OPENSSL_QUIC_H
-# define OPENSSL_QUIC_H
-# pragma once
+#define OPENSSL_QUIC_H
+#pragma once
 
-# include <openssl/macros.h>
-# include <openssl/ssl.h>
+#include <openssl/macros.h>
+#include <openssl/ssl.h>
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
 /*
  * Method used for non-thread-assisted QUIC client operation.
@@ -33,33 +33,33 @@ __owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
 /*
  * QUIC transport error codes (RFC 9000 s. 20.1)
  */
-#  define OSSL_QUIC_ERR_NO_ERROR                  0x00
-#  define OSSL_QUIC_ERR_INTERNAL_ERROR            0x01
-#  define OSSL_QUIC_ERR_CONNECTION_REFUSED        0x02
-#  define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR        0x03
-#  define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR        0x04
-#  define OSSL_QUIC_ERR_STREAM_STATE_ERROR        0x05
-#  define OSSL_QUIC_ERR_FINAL_SIZE_ERROR          0x06
-#  define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR      0x07
-#  define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
-#  define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
-#  define OSSL_QUIC_ERR_PROTOCOL_VIOLATION        0x0A
-#  define OSSL_QUIC_ERR_INVALID_TOKEN             0x0B
-#  define OSSL_QUIC_ERR_APPLICATION_ERROR         0x0C
-#  define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED    0x0D
-#  define OSSL_QUIC_ERR_KEY_UPDATE_ERROR          0x0E
-#  define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED        0x0F
-#  define OSSL_QUIC_ERR_NO_VIABLE_PATH            0x10
+#define OSSL_QUIC_ERR_NO_ERROR 0x00
+#define OSSL_QUIC_ERR_INTERNAL_ERROR 0x01
+#define OSSL_QUIC_ERR_CONNECTION_REFUSED 0x02
+#define OSSL_QUIC_ERR_FLOW_CONTROL_ERROR 0x03
+#define OSSL_QUIC_ERR_STREAM_LIMIT_ERROR 0x04
+#define OSSL_QUIC_ERR_STREAM_STATE_ERROR 0x05
+#define OSSL_QUIC_ERR_FINAL_SIZE_ERROR 0x06
+#define OSSL_QUIC_ERR_FRAME_ENCODING_ERROR 0x07
+#define OSSL_QUIC_ERR_TRANSPORT_PARAMETER_ERROR 0x08
+#define OSSL_QUIC_ERR_CONNECTION_ID_LIMIT_ERROR 0x09
+#define OSSL_QUIC_ERR_PROTOCOL_VIOLATION 0x0A
+#define OSSL_QUIC_ERR_INVALID_TOKEN 0x0B
+#define OSSL_QUIC_ERR_APPLICATION_ERROR 0x0C
+#define OSSL_QUIC_ERR_CRYPTO_BUFFER_EXCEEDED 0x0D
+#define OSSL_QUIC_ERR_KEY_UPDATE_ERROR 0x0E
+#define OSSL_QUIC_ERR_AEAD_LIMIT_REACHED 0x0F
+#define OSSL_QUIC_ERR_NO_VIABLE_PATH 0x10
 
 /* Inclusive range for handshake-specific errors. */
-#  define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN          0x0100
-#  define OSSL_QUIC_ERR_CRYPTO_ERR_END            0x01FF
+#define OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN 0x0100
+#define OSSL_QUIC_ERR_CRYPTO_ERR_END 0x01FF
 
-#  define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
+#define OSSL_QUIC_ERR_CRYPTO_ERR(X) \
     (OSSL_QUIC_ERR_CRYPTO_ERR_BEGIN + (X))
 
 /* Local errors. */
-#  define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT        \
+#define OSSL_QUIC_LOCAL_ERR_IDLE_TIMEOUT \
     ((uint64_t)0xFFFFFFFFFFFFFFFFULL)
 
 /*
@@ -67,9 +67,9 @@ __owur const SSL_METHOD *OSSL_QUIC_client_thread_method(void);
  */
 __owur const SSL_METHOD *OSSL_QUIC_server_method(void);
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 }
-#  endif
+#endif
 
-# endif /* OPENSSL_NO_QUIC */
+#endif /* OPENSSL_NO_QUIC */
 #endif
diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index 4e59e50f7839..7272309fba70 100644
--- a/include/openssl/rand.h
+++ b/include/openssl/rand.h
@@ -8,23 +8,23 @@
  */
 
 #ifndef OPENSSL_RAND_H
-# define OPENSSL_RAND_H
-# pragma once
+#define OPENSSL_RAND_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RAND_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RAND_H
+#endif
 
-# include <stdlib.h>
-# include <openssl/types.h>
-# include <openssl/e_os2.h>
-# include <openssl/randerr.h>
-# include <openssl/evp.h>
+#include <stdlib.h>
+#include <openssl/types.h>
+#include <openssl/e_os2.h>
+#include <openssl/randerr.h>
+#include <openssl/evp.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * Default security strength (in the sense of [NIST SP 800-90Ar1])
@@ -34,30 +34,32 @@ extern "C" {
  * does not take RAND_DRBG_STRENGTH into account and sets the strength of the
  * DRBG to that of the cipher.
  */
-# define RAND_DRBG_STRENGTH             256
+#define RAND_DRBG_STRENGTH 256
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 struct rand_meth_st {
-    int (*seed) (const void *buf, int num);
-    int (*bytes) (unsigned char *buf, int num);
-    void (*cleanup) (void);
-    int (*add) (const void *buf, int num, double randomness);
-    int (*pseudorand) (unsigned char *buf, int num);
-    int (*status) (void);
+    int (*seed)(const void *buf, int num);
+    int (*bytes)(unsigned char *buf, int num);
+    void (*cleanup)(void);
+    int (*add)(const void *buf, int num, double randomness);
+    int (*pseudorand)(unsigned char *buf, int num);
+    int (*status)(void);
 };
 
 OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_method(const RAND_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 const RAND_METHOD *RAND_get_rand_method(void);
-#  ifndef OPENSSL_NO_ENGINE
+#ifndef OPENSSL_NO_ENGINE
 OSSL_DEPRECATEDIN_3_0 int RAND_set_rand_engine(ENGINE *engine);
-#  endif
+#endif
 
 OSSL_DEPRECATEDIN_3_0 RAND_METHOD *RAND_OpenSSL(void);
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#   define RAND_cleanup() while(0) continue
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define RAND_cleanup() \
+    while (0)          \
+    continue
+#endif
 int RAND_bytes(unsigned char *buf, int num);
 int RAND_priv_bytes(unsigned char *buf, int num);
 
@@ -66,18 +68,18 @@ int RAND_priv_bytes(unsigned char *buf, int num);
  * a strength.
  */
 int RAND_priv_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
-                       unsigned int strength);
+    unsigned int strength);
 
 /*
  * Equivalent of RAND_bytes() but additionally taking an OSSL_LIB_CTX and
  * a strength.
  */
 int RAND_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, size_t num,
-                  unsigned int strength);
+    unsigned int strength);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 int RAND_pseudo_bytes(unsigned char *buf, int num);
-# endif
+#endif
 
 EVP_RAND_CTX *RAND_get0_primary(OSSL_LIB_CTX *ctx);
 EVP_RAND_CTX *RAND_get0_public(OSSL_LIB_CTX *ctx);
@@ -86,46 +88,46 @@ int RAND_set0_public(OSSL_LIB_CTX *ctx, EVP_RAND_CTX *rand);
 int RAND_set0_private(OSSL_LIB_CTX *ctx, EVP_RAND_CTX *rand);
 
 int RAND_set_DRBG_type(OSSL_LIB_CTX *ctx, const char *drbg, const char *propq,
-                       const char *cipher, const char *digest);
+    const char *cipher, const char *digest);
 int RAND_set_seed_source_type(OSSL_LIB_CTX *ctx, const char *seed,
-                              const char *propq);
+    const char *propq);
 
 void RAND_seed(const void *buf, int num);
 void RAND_keep_random_devices_open(int keep);
 
-# if defined(__ANDROID__) && defined(__NDK_FPABI__)
-__NDK_FPABI__   /* __attribute__((pcs("aapcs"))) on ARM */
-# endif
-void RAND_add(const void *buf, int num, double randomness);
+#if defined(__ANDROID__) && defined(__NDK_FPABI__)
+__NDK_FPABI__ /* __attribute__((pcs("aapcs"))) on ARM */
+#endif
+    void RAND_add(const void *buf, int num, double randomness);
 int RAND_load_file(const char *file, long max_bytes);
 int RAND_write_file(const char *file);
 const char *RAND_file_name(char *file, size_t num);
 int RAND_status(void);
 
-# ifndef OPENSSL_NO_EGD
+#ifndef OPENSSL_NO_EGD
 int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
 int RAND_egd(const char *path);
 int RAND_egd_bytes(const char *path, int bytes);
-# endif
+#endif
 
 int RAND_poll(void);
 
-# if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H))
+#if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H))
 /* application has to include <windows.h> in order to use these */
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 void RAND_screen(void);
 OSSL_DEPRECATEDIN_1_1_0 int RAND_event(UINT, WPARAM, LPARAM);
-#  endif
-# endif
+#endif
+#endif
 
 int RAND_set1_random_provider(OSSL_LIB_CTX *ctx, OSSL_PROVIDER *p);
 
 /* Which parameter to provider_random call */
-# define OSSL_PROV_RANDOM_PUBLIC     0
-# define OSSL_PROV_RANDOM_PRIVATE    1
+#define OSSL_PROV_RANDOM_PUBLIC 0
+#define OSSL_PROV_RANDOM_PRIVATE 1
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h
index 5e1e6d7996c5..6107cdd48167 100644
--- a/include/openssl/randerr.h
+++ b/include/openssl/randerr.h
@@ -9,62 +9,60 @@
  */
 
 #ifndef OPENSSL_RANDERR_H
-# define OPENSSL_RANDERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_RANDERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * RAND reason codes.
  */
-# define RAND_R_ADDITIONAL_INPUT_TOO_LONG                 102
-# define RAND_R_ALREADY_INSTANTIATED                      103
-# define RAND_R_ARGUMENT_OUT_OF_RANGE                     105
-# define RAND_R_CANNOT_OPEN_FILE                          121
-# define RAND_R_DRBG_ALREADY_INITIALIZED                  129
-# define RAND_R_DRBG_NOT_INITIALISED                      104
-# define RAND_R_ENTROPY_INPUT_TOO_LONG                    106
-# define RAND_R_ENTROPY_OUT_OF_RANGE                      124
-# define RAND_R_ERROR_ENTROPY_POOL_WAS_IGNORED            127
-# define RAND_R_ERROR_INITIALISING_DRBG                   107
-# define RAND_R_ERROR_INSTANTIATING_DRBG                  108
-# define RAND_R_ERROR_RETRIEVING_ADDITIONAL_INPUT         109
-# define RAND_R_ERROR_RETRIEVING_ENTROPY                  110
-# define RAND_R_ERROR_RETRIEVING_NONCE                    111
-# define RAND_R_FAILED_TO_CREATE_LOCK                     126
-# define RAND_R_FUNC_NOT_IMPLEMENTED                      101
-# define RAND_R_FWRITE_ERROR                              123
-# define RAND_R_GENERATE_ERROR                            112
-# define RAND_R_INSUFFICIENT_DRBG_STRENGTH                139
-# define RAND_R_INTERNAL_ERROR                            113
-# define RAND_R_INVALID_PROPERTY_QUERY                    137
-# define RAND_R_IN_ERROR_STATE                            114
-# define RAND_R_NOT_A_REGULAR_FILE                        122
-# define RAND_R_NOT_INSTANTIATED                          115
-# define RAND_R_NO_DRBG_IMPLEMENTATION_SELECTED           128
-# define RAND_R_PARENT_LOCKING_NOT_ENABLED                130
-# define RAND_R_PARENT_STRENGTH_TOO_WEAK                  131
-# define RAND_R_PERSONALISATION_STRING_TOO_LONG           116
-# define RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED       133
-# define RAND_R_PRNG_NOT_SEEDED                           100
-# define RAND_R_RANDOM_POOL_IS_EMPTY                      142
-# define RAND_R_RANDOM_POOL_OVERFLOW                      125
-# define RAND_R_RANDOM_POOL_UNDERFLOW                     134
-# define RAND_R_REQUEST_TOO_LARGE_FOR_DRBG                117
-# define RAND_R_RESEED_ERROR                              118
-# define RAND_R_SELFTEST_FAILURE                          119
-# define RAND_R_TOO_LITTLE_NONCE_REQUESTED                135
-# define RAND_R_TOO_MUCH_NONCE_REQUESTED                  136
-# define RAND_R_UNABLE_TO_CREATE_DRBG                     143
-# define RAND_R_UNABLE_TO_FETCH_DRBG                      144
-# define RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER  141
-# define RAND_R_UNABLE_TO_GET_PARENT_STRENGTH             138
-# define RAND_R_UNABLE_TO_LOCK_PARENT                     140
-# define RAND_R_UNSUPPORTED_DRBG_FLAGS                    132
-# define RAND_R_UNSUPPORTED_DRBG_TYPE                     120
+#define RAND_R_ADDITIONAL_INPUT_TOO_LONG 102
+#define RAND_R_ALREADY_INSTANTIATED 103
+#define RAND_R_ARGUMENT_OUT_OF_RANGE 105
+#define RAND_R_CANNOT_OPEN_FILE 121
+#define RAND_R_DRBG_ALREADY_INITIALIZED 129
+#define RAND_R_DRBG_NOT_INITIALISED 104
+#define RAND_R_ENTROPY_INPUT_TOO_LONG 106
+#define RAND_R_ENTROPY_OUT_OF_RANGE 124
+#define RAND_R_ERROR_ENTROPY_POOL_WAS_IGNORED 127
+#define RAND_R_ERROR_INITIALISING_DRBG 107
+#define RAND_R_ERROR_INSTANTIATING_DRBG 108
+#define RAND_R_ERROR_RETRIEVING_ADDITIONAL_INPUT 109
+#define RAND_R_ERROR_RETRIEVING_ENTROPY 110
+#define RAND_R_ERROR_RETRIEVING_NONCE 111
+#define RAND_R_FAILED_TO_CREATE_LOCK 126
+#define RAND_R_FUNC_NOT_IMPLEMENTED 101
+#define RAND_R_FWRITE_ERROR 123
+#define RAND_R_GENERATE_ERROR 112
+#define RAND_R_INSUFFICIENT_DRBG_STRENGTH 139
+#define RAND_R_INTERNAL_ERROR 113
+#define RAND_R_INVALID_PROPERTY_QUERY 137
+#define RAND_R_IN_ERROR_STATE 114
+#define RAND_R_NOT_A_REGULAR_FILE 122
+#define RAND_R_NOT_INSTANTIATED 115
+#define RAND_R_NO_DRBG_IMPLEMENTATION_SELECTED 128
+#define RAND_R_PARENT_LOCKING_NOT_ENABLED 130
+#define RAND_R_PARENT_STRENGTH_TOO_WEAK 131
+#define RAND_R_PERSONALISATION_STRING_TOO_LONG 116
+#define RAND_R_PREDICTION_RESISTANCE_NOT_SUPPORTED 133
+#define RAND_R_PRNG_NOT_SEEDED 100
+#define RAND_R_RANDOM_POOL_IS_EMPTY 142
+#define RAND_R_RANDOM_POOL_OVERFLOW 125
+#define RAND_R_RANDOM_POOL_UNDERFLOW 134
+#define RAND_R_REQUEST_TOO_LARGE_FOR_DRBG 117
+#define RAND_R_RESEED_ERROR 118
+#define RAND_R_SELFTEST_FAILURE 119
+#define RAND_R_TOO_LITTLE_NONCE_REQUESTED 135
+#define RAND_R_TOO_MUCH_NONCE_REQUESTED 136
+#define RAND_R_UNABLE_TO_CREATE_DRBG 143
+#define RAND_R_UNABLE_TO_FETCH_DRBG 144
+#define RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER 141
+#define RAND_R_UNABLE_TO_GET_PARENT_STRENGTH 138
+#define RAND_R_UNABLE_TO_LOCK_PARENT 140
+#define RAND_R_UNSUPPORTED_DRBG_FLAGS 132
+#define RAND_R_UNSUPPORTED_DRBG_TYPE 120
 
 #endif
diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h
index ff633fd80f16..7da28f7c72c3 100644
--- a/include/openssl/rc2.h
+++ b/include/openssl/rc2.h
@@ -8,61 +8,61 @@
  */
 
 #ifndef OPENSSL_RC2_H
-# define OPENSSL_RC2_H
-# pragma once
+#define OPENSSL_RC2_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RC2_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RC2_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_RC2
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_RC2
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define RC2_BLOCK       8
-#  define RC2_KEY_LENGTH  16
+#define RC2_BLOCK 8
+#define RC2_KEY_LENGTH 16
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef unsigned int RC2_INT;
 
-#   define RC2_ENCRYPT     1
-#   define RC2_DECRYPT     0
+#define RC2_ENCRYPT 1
+#define RC2_DECRYPT 0
 
 typedef struct rc2_key_st {
     RC2_INT data[64];
 } RC2_KEY;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 void RC2_set_key(RC2_KEY *key, int len,
-                                       const unsigned char *data, int bits);
+    const unsigned char *data, int bits);
 OSSL_DEPRECATEDIN_3_0 void RC2_ecb_encrypt(const unsigned char *in,
-                                           unsigned char *out, RC2_KEY *key,
-                                           int enc);
+    unsigned char *out, RC2_KEY *key,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void RC2_encrypt(unsigned long *data, RC2_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void RC2_decrypt(unsigned long *data, RC2_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void RC2_cbc_encrypt(const unsigned char *in,
-                                           unsigned char *out, long length,
-                                           RC2_KEY *ks, unsigned char *iv,
-                                           int enc);
+    unsigned char *out, long length,
+    RC2_KEY *ks, unsigned char *iv,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void RC2_cfb64_encrypt(const unsigned char *in,
-                                             unsigned char *out, long length,
-                                             RC2_KEY *schedule,
-                                             unsigned char *ivec,
-                                             int *num, int enc);
+    unsigned char *out, long length,
+    RC2_KEY *schedule,
+    unsigned char *ivec,
+    int *num, int enc);
 OSSL_DEPRECATEDIN_3_0 void RC2_ofb64_encrypt(const unsigned char *in,
-                                             unsigned char *out, long length,
-                                             RC2_KEY *schedule,
-                                             unsigned char *ivec,
-                                             int *num);
-#  endif
+    unsigned char *out, long length,
+    RC2_KEY *schedule,
+    unsigned char *ivec,
+    int *num);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h
index 600b2885df1b..92dce0c40522 100644
--- a/include/openssl/rc4.h
+++ b/include/openssl/rc4.h
@@ -8,40 +8,40 @@
  */
 
 #ifndef OPENSSL_RC4_H
-# define OPENSSL_RC4_H
-# pragma once
+#define OPENSSL_RC4_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RC4_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RC4_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_RC4
-#  include <stddef.h>
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_RC4
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef struct rc4_key_st {
     RC4_INT x, y;
     RC4_INT data[256];
 } RC4_KEY;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 const char *RC4_options(void);
 OSSL_DEPRECATEDIN_3_0 void RC4_set_key(RC4_KEY *key, int len,
-                                       const unsigned char *data);
+    const unsigned char *data);
 OSSL_DEPRECATEDIN_3_0 void RC4(RC4_KEY *key, size_t len,
-                               const unsigned char *indata,
-                               unsigned char *outdata);
-#  endif
+    const unsigned char *indata,
+    unsigned char *outdata);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h
index de833523102a..2e91e9854097 100644
--- a/include/openssl/rc5.h
+++ b/include/openssl/rc5.h
@@ -8,72 +8,72 @@
  */
 
 #ifndef OPENSSL_RC5_H
-# define OPENSSL_RC5_H
-# pragma once
+#define OPENSSL_RC5_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RC5_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RC5_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_RC5
-#  ifdef  __cplusplus
+#ifndef OPENSSL_NO_RC5
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define RC5_32_BLOCK            8
-#  define RC5_32_KEY_LENGTH       16/* This is a default, max is 255 */
+#define RC5_32_BLOCK 8
+#define RC5_32_KEY_LENGTH 16 /* This is a default, max is 255 */
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define RC5_ENCRYPT     1
-#   define RC5_DECRYPT     0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define RC5_ENCRYPT 1
+#define RC5_DECRYPT 0
 
-#   define RC5_32_INT unsigned int
+#define RC5_32_INT unsigned int
 
 /*
  * This are the only values supported.  Tweak the code if you want more The
  * most supported modes will be RC5-32/12/16 RC5-32/16/8
  */
-#   define RC5_8_ROUNDS    8
-#   define RC5_12_ROUNDS   12
-#   define RC5_16_ROUNDS   16
+#define RC5_8_ROUNDS 8
+#define RC5_12_ROUNDS 12
+#define RC5_16_ROUNDS 16
 
 typedef struct rc5_key_st {
     /* Number of rounds */
     int rounds;
     RC5_32_INT data[2 * (RC5_16_ROUNDS + 1)];
 } RC5_32_KEY;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int RC5_32_set_key(RC5_32_KEY *key, int len,
-                                         const unsigned char *data,
-                                         int rounds);
+    const unsigned char *data,
+    int rounds);
 OSSL_DEPRECATEDIN_3_0 void RC5_32_ecb_encrypt(const unsigned char *in,
-                                              unsigned char *out,
-                                              RC5_32_KEY *key,
-                                              int enc);
+    unsigned char *out,
+    RC5_32_KEY *key,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key);
 OSSL_DEPRECATEDIN_3_0 void RC5_32_cbc_encrypt(const unsigned char *in,
-                                              unsigned char *out, long length,
-                                              RC5_32_KEY *ks, unsigned char *iv,
-                                              int enc);
+    unsigned char *out, long length,
+    RC5_32_KEY *ks, unsigned char *iv,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void RC5_32_cfb64_encrypt(const unsigned char *in,
-                                                unsigned char *out, long length,
-                                                RC5_32_KEY *schedule,
-                                                unsigned char *ivec, int *num,
-                                                int enc);
+    unsigned char *out, long length,
+    RC5_32_KEY *schedule,
+    unsigned char *ivec, int *num,
+    int enc);
 OSSL_DEPRECATEDIN_3_0 void RC5_32_ofb64_encrypt(const unsigned char *in,
-                                                unsigned char *out, long length,
-                                                RC5_32_KEY *schedule,
-                                                unsigned char *ivec, int *num);
-#  endif
+    unsigned char *out, long length,
+    RC5_32_KEY *schedule,
+    unsigned char *ivec, int *num);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h
index 900ee317b928..a72d1dad0a17 100644
--- a/include/openssl/ripemd.h
+++ b/include/openssl/ripemd.h
@@ -8,31 +8,31 @@
  */
 
 #ifndef OPENSSL_RIPEMD_H
-# define OPENSSL_RIPEMD_H
-# pragma once
+#define OPENSSL_RIPEMD_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RIPEMD_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RIPEMD_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_RMD160
-#  include <openssl/e_os2.h>
-#  include <stddef.h>
+#ifndef OPENSSL_NO_RMD160
+#include <openssl/e_os2.h>
+#include <stddef.h>
 
-#  define RIPEMD160_DIGEST_LENGTH 20
+#define RIPEMD160_DIGEST_LENGTH 20
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#endif
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
 
-#   define RIPEMD160_LONG unsigned int
+#define RIPEMD160_LONG unsigned int
 
-#   define RIPEMD160_CBLOCK        64
-#   define RIPEMD160_LBLOCK        (RIPEMD160_CBLOCK/4)
+#define RIPEMD160_CBLOCK 64
+#define RIPEMD160_LBLOCK (RIPEMD160_CBLOCK / 4)
 
 typedef struct RIPEMD160state_st {
     RIPEMD160_LONG A, B, C, D, E;
@@ -40,20 +40,20 @@ typedef struct RIPEMD160state_st {
     RIPEMD160_LONG data[RIPEMD160_LBLOCK];
     unsigned int num;
 } RIPEMD160_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int RIPEMD160_Init(RIPEMD160_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data,
-                                           size_t len);
+    size_t len);
 OSSL_DEPRECATEDIN_3_0 int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
 OSSL_DEPRECATEDIN_3_0 unsigned char *RIPEMD160(const unsigned char *d, size_t n,
-                                               unsigned char *md);
+    unsigned char *md);
 OSSL_DEPRECATEDIN_3_0 void RIPEMD160_Transform(RIPEMD160_CTX *c,
-                                               const unsigned char *b);
-#  endif
+    const unsigned char *b);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 #endif
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index 167427d3c486..a06d4f0a0272 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -8,71 +8,71 @@
  */
 
 #ifndef OPENSSL_RSA_H
-# define OPENSSL_RSA_H
-# pragma once
+#define OPENSSL_RSA_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_RSA_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_RSA_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# include <openssl/asn1.h>
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/types.h>
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  include <openssl/bn.h>
-# endif
-# include <openssl/rsaerr.h>
-# include <openssl/safestack.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/asn1.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/types.h>
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/bn.h>
+#endif
+#include <openssl/rsaerr.h>
+#include <openssl/safestack.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# ifndef OPENSSL_RSA_MAX_MODULUS_BITS
-#  define OPENSSL_RSA_MAX_MODULUS_BITS   16384
-# endif
+#ifndef OPENSSL_RSA_MAX_MODULUS_BITS
+#define OPENSSL_RSA_MAX_MODULUS_BITS 16384
+#endif
 
-# define RSA_3   0x3L
-# define RSA_F4  0x10001L
+#define RSA_3 0x3L
+#define RSA_F4 0x10001L
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* The types RSA and RSA_METHOD are defined in ossl_typ.h */
 
-#  define OPENSSL_RSA_FIPS_MIN_MODULUS_BITS 2048
+#define OPENSSL_RSA_FIPS_MIN_MODULUS_BITS 2048
 
-#  ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
-#   define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
-#  endif
+#ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
+#define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
+#endif
 
 /* exponent limit enforced for "large" modulus only */
-#  ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
-#   define OPENSSL_RSA_MAX_PUBEXP_BITS    64
-#  endif
+#ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
+#define OPENSSL_RSA_MAX_PUBEXP_BITS 64
+#endif
 /* based on RFC 8017 appendix A.1.2 */
-#  define RSA_ASN1_VERSION_DEFAULT        0
-#  define RSA_ASN1_VERSION_MULTI          1
+#define RSA_ASN1_VERSION_DEFAULT 0
+#define RSA_ASN1_VERSION_MULTI 1
 
-#  define RSA_DEFAULT_PRIME_NUM           2
+#define RSA_DEFAULT_PRIME_NUM 2
 
-#  define RSA_METHOD_FLAG_NO_CHECK        0x0001
-#  define RSA_FLAG_CACHE_PUBLIC           0x0002
-#  define RSA_FLAG_CACHE_PRIVATE          0x0004
-#  define RSA_FLAG_BLINDING               0x0008
-#  define RSA_FLAG_THREAD_SAFE            0x0010
+#define RSA_METHOD_FLAG_NO_CHECK 0x0001
+#define RSA_FLAG_CACHE_PUBLIC 0x0002
+#define RSA_FLAG_CACHE_PRIVATE 0x0004
+#define RSA_FLAG_BLINDING 0x0008
+#define RSA_FLAG_THREAD_SAFE 0x0010
 /*
  * This flag means the private key operations will be handled by rsa_mod_exp
  * and that they do not depend on the private key components being present:
  * for example a key stored in external hardware. Without this flag
  * bn_mod_exp gets called when private key components are absent.
  */
-#  define RSA_FLAG_EXT_PKEY               0x0020
+#define RSA_FLAG_EXT_PKEY 0x0020
 
 /*
  * new with 0.9.6j and 0.9.7b; the built-in
@@ -80,14 +80,14 @@ extern "C" {
  * default (ignoring RSA_FLAG_BLINDING),
  * but other engines might not need it
  */
-#  define RSA_FLAG_NO_BLINDING            0x0080
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#define RSA_FLAG_NO_BLINDING 0x0080
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 /*
  * Does nothing. Previously this switched off constant time behaviour.
  */
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define RSA_FLAG_NO_CONSTTIME           0x0000
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define RSA_FLAG_NO_CONSTTIME 0x0000
+#endif
 /* deprecated name for the flag*/
 /*
  * new with 0.9.7h; the built-in RSA
@@ -97,9 +97,9 @@ extern "C" {
  * faster variable sliding window method to
  * be used for all exponents.
  */
-# ifndef OPENSSL_NO_DEPRECATED_0_9_8
-#  define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
+#define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME
+#endif
 
 /*-
  * New with 3.0: use part of the flags to denote exact type of RSA key,
@@ -114,10 +114,10 @@ extern "C" {
  *
  * 4 bits allow for 16 types
  */
-# define RSA_FLAG_TYPE_MASK            0xF000
-# define RSA_FLAG_TYPE_RSA             0x0000
-# define RSA_FLAG_TYPE_RSASSAPSS       0x1000
-# define RSA_FLAG_TYPE_RSAESOAEP       0x2000
+#define RSA_FLAG_TYPE_MASK 0xF000
+#define RSA_FLAG_TYPE_RSA 0x0000
+#define RSA_FLAG_TYPE_RSASSAPSS 0x1000
+#define RSA_FLAG_TYPE_RSAESOAEP 0x2000
 
 int EVP_PKEY_CTX_set_rsa_padding(EVP_PKEY_CTX *ctx, int pad_mode);
 int EVP_PKEY_CTX_get_rsa_padding(EVP_PKEY_CTX *ctx, int *pad_mode);
@@ -129,86 +129,86 @@ int EVP_PKEY_CTX_set_rsa_keygen_bits(EVP_PKEY_CTX *ctx, int bits);
 int EVP_PKEY_CTX_set1_rsa_keygen_pubexp(EVP_PKEY_CTX *ctx, BIGNUM *pubexp);
 int EVP_PKEY_CTX_set_rsa_keygen_primes(EVP_PKEY_CTX *ctx, int primes);
 int EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen(EVP_PKEY_CTX *ctx, int saltlen);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int EVP_PKEY_CTX_set_rsa_keygen_pubexp(EVP_PKEY_CTX *ctx, BIGNUM *pubexp);
-# endif
+#endif
 
 /* Salt length matches digest */
-# define RSA_PSS_SALTLEN_DIGEST -1
+#define RSA_PSS_SALTLEN_DIGEST -1
 /* Verify only: auto detect salt length */
-# define RSA_PSS_SALTLEN_AUTO   -2
+#define RSA_PSS_SALTLEN_AUTO -2
 /* Set salt length to maximum possible */
-# define RSA_PSS_SALTLEN_MAX    -3
+#define RSA_PSS_SALTLEN_MAX -3
 /* Auto-detect on verify, set salt length to min(maximum possible, digest
  * length) on sign */
-# define RSA_PSS_SALTLEN_AUTO_DIGEST_MAX  -4
+#define RSA_PSS_SALTLEN_AUTO_DIGEST_MAX -4
 /* Old compatible max salt length for sign only */
-# define RSA_PSS_SALTLEN_MAX_SIGN    -2
+#define RSA_PSS_SALTLEN_MAX_SIGN -2
 
 int EVP_PKEY_CTX_set_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 int EVP_PKEY_CTX_set_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, const char *mdname,
-                                      const char *mdprops);
+    const char *mdprops);
 int EVP_PKEY_CTX_get_rsa_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD **md);
 int EVP_PKEY_CTX_get_rsa_mgf1_md_name(EVP_PKEY_CTX *ctx, char *name,
-                                      size_t namelen);
+    size_t namelen);
 int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 int EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name(EVP_PKEY_CTX *ctx,
-                                                 const char *mdname);
+    const char *mdname);
 
 int EVP_PKEY_CTX_set_rsa_pss_keygen_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 int EVP_PKEY_CTX_set_rsa_pss_keygen_md_name(EVP_PKEY_CTX *ctx,
-                                            const char *mdname,
-                                            const char *mdprops);
+    const char *mdname,
+    const char *mdprops);
 
 int EVP_PKEY_CTX_set_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD *md);
 int EVP_PKEY_CTX_set_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, const char *mdname,
-                                      const char *mdprops);
+    const char *mdprops);
 int EVP_PKEY_CTX_get_rsa_oaep_md(EVP_PKEY_CTX *ctx, const EVP_MD **md);
 int EVP_PKEY_CTX_get_rsa_oaep_md_name(EVP_PKEY_CTX *ctx, char *name,
-                                      size_t namelen);
+    size_t namelen);
 int EVP_PKEY_CTX_set0_rsa_oaep_label(EVP_PKEY_CTX *ctx, void *label, int llen);
 int EVP_PKEY_CTX_get0_rsa_oaep_label(EVP_PKEY_CTX *ctx, unsigned char **label);
 
-# define EVP_PKEY_CTRL_RSA_PADDING       (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_RSA_PSS_SALTLEN   (EVP_PKEY_ALG_CTRL + 2)
+#define EVP_PKEY_CTRL_RSA_PADDING (EVP_PKEY_ALG_CTRL + 1)
+#define EVP_PKEY_CTRL_RSA_PSS_SALTLEN (EVP_PKEY_ALG_CTRL + 2)
 
-# define EVP_PKEY_CTRL_RSA_KEYGEN_BITS   (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_RSA_MGF1_MD       (EVP_PKEY_ALG_CTRL + 5)
+#define EVP_PKEY_CTRL_RSA_KEYGEN_BITS (EVP_PKEY_ALG_CTRL + 3)
+#define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4)
+#define EVP_PKEY_CTRL_RSA_MGF1_MD (EVP_PKEY_ALG_CTRL + 5)
 
-# define EVP_PKEY_CTRL_GET_RSA_PADDING           (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN       (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_RSA_MGF1_MD           (EVP_PKEY_ALG_CTRL + 8)
+#define EVP_PKEY_CTRL_GET_RSA_PADDING (EVP_PKEY_ALG_CTRL + 6)
+#define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN (EVP_PKEY_ALG_CTRL + 7)
+#define EVP_PKEY_CTRL_GET_RSA_MGF1_MD (EVP_PKEY_ALG_CTRL + 8)
 
-# define EVP_PKEY_CTRL_RSA_OAEP_MD       (EVP_PKEY_ALG_CTRL + 9)
-# define EVP_PKEY_CTRL_RSA_OAEP_LABEL    (EVP_PKEY_ALG_CTRL + 10)
+#define EVP_PKEY_CTRL_RSA_OAEP_MD (EVP_PKEY_ALG_CTRL + 9)
+#define EVP_PKEY_CTRL_RSA_OAEP_LABEL (EVP_PKEY_ALG_CTRL + 10)
 
-# define EVP_PKEY_CTRL_GET_RSA_OAEP_MD   (EVP_PKEY_ALG_CTRL + 11)
-# define EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL (EVP_PKEY_ALG_CTRL + 12)
+#define EVP_PKEY_CTRL_GET_RSA_OAEP_MD (EVP_PKEY_ALG_CTRL + 11)
+#define EVP_PKEY_CTRL_GET_RSA_OAEP_LABEL (EVP_PKEY_ALG_CTRL + 12)
 
-# define EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES  (EVP_PKEY_ALG_CTRL + 13)
+#define EVP_PKEY_CTRL_RSA_KEYGEN_PRIMES (EVP_PKEY_ALG_CTRL + 13)
 
-# define EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION (EVP_PKEY_ALG_CTRL + 14)
+#define EVP_PKEY_CTRL_RSA_IMPLICIT_REJECTION (EVP_PKEY_ALG_CTRL + 14)
 
-# define RSA_PKCS1_PADDING          1
-# define RSA_NO_PADDING             3
-# define RSA_PKCS1_OAEP_PADDING     4
-# define RSA_X931_PADDING           5
+#define RSA_PKCS1_PADDING 1
+#define RSA_NO_PADDING 3
+#define RSA_PKCS1_OAEP_PADDING 4
+#define RSA_X931_PADDING 5
 
 /* EVP_PKEY_ only */
-# define RSA_PKCS1_PSS_PADDING      6
-# define RSA_PKCS1_WITH_TLS_PADDING 7
+#define RSA_PKCS1_PSS_PADDING 6
+#define RSA_PKCS1_WITH_TLS_PADDING 7
 
 /* internal RSA_ only */
-# define RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING 8
+#define RSA_PKCS1_NO_IMPLICIT_REJECT_PADDING 8
 
-# define RSA_PKCS1_PADDING_SIZE    11
+#define RSA_PKCS1_PADDING_SIZE 11
 
-# define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,arg)
-# define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
+#define RSA_set_app_data(s, arg) RSA_set_ex_data(s, 0, arg)
+#define RSA_get_app_data(s) RSA_get_ex_data(s, 0)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 RSA *RSA_new(void);
 OSSL_DEPRECATEDIN_3_0 RSA *RSA_new_method(ENGINE *engine);
 OSSL_DEPRECATEDIN_3_0 int RSA_bits(const RSA *rsa);
@@ -218,28 +218,28 @@ OSSL_DEPRECATEDIN_3_0 int RSA_security_bits(const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0 int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
 OSSL_DEPRECATEDIN_3_0 int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
 OSSL_DEPRECATEDIN_3_0 int RSA_set0_crt_params(RSA *r,
-                                              BIGNUM *dmp1, BIGNUM *dmq1,
-                                              BIGNUM *iqmp);
+    BIGNUM *dmp1, BIGNUM *dmq1,
+    BIGNUM *iqmp);
 OSSL_DEPRECATEDIN_3_0 int RSA_set0_multi_prime_params(RSA *r,
-                                                      BIGNUM *primes[],
-                                                      BIGNUM *exps[],
-                                                      BIGNUM *coeffs[],
-                                                      int pnum);
+    BIGNUM *primes[],
+    BIGNUM *exps[],
+    BIGNUM *coeffs[],
+    int pnum);
 OSSL_DEPRECATEDIN_3_0 void RSA_get0_key(const RSA *r,
-                                        const BIGNUM **n, const BIGNUM **e,
-                                        const BIGNUM **d);
+    const BIGNUM **n, const BIGNUM **e,
+    const BIGNUM **d);
 OSSL_DEPRECATEDIN_3_0 void RSA_get0_factors(const RSA *r,
-                                            const BIGNUM **p, const BIGNUM **q);
+    const BIGNUM **p, const BIGNUM **q);
 OSSL_DEPRECATEDIN_3_0 int RSA_get_multi_prime_extra_count(const RSA *r);
 OSSL_DEPRECATEDIN_3_0 int RSA_get0_multi_prime_factors(const RSA *r,
-                                                       const BIGNUM *primes[]);
+    const BIGNUM *primes[]);
 OSSL_DEPRECATEDIN_3_0 void RSA_get0_crt_params(const RSA *r,
-                                               const BIGNUM **dmp1,
-                                               const BIGNUM **dmq1,
-                                               const BIGNUM **iqmp);
+    const BIGNUM **dmp1,
+    const BIGNUM **dmq1,
+    const BIGNUM **iqmp);
 OSSL_DEPRECATEDIN_3_0
 int RSA_get0_multi_prime_crt_params(const RSA *r, const BIGNUM *exps[],
-                                    const BIGNUM *coeffs[]);
+    const BIGNUM *coeffs[]);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *RSA_get0_n(const RSA *d);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *RSA_get0_e(const RSA *d);
 OSSL_DEPRECATEDIN_3_0 const BIGNUM *RSA_get0_d(const RSA *d);
@@ -254,53 +254,52 @@ OSSL_DEPRECATEDIN_3_0 int RSA_test_flags(const RSA *r, int flags);
 OSSL_DEPRECATEDIN_3_0 void RSA_set_flags(RSA *r, int flags);
 OSSL_DEPRECATEDIN_3_0 int RSA_get_version(RSA *r);
 OSSL_DEPRECATEDIN_3_0 ENGINE *RSA_get0_engine(const RSA *r);
-# endif  /* !OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 
-# define EVP_RSA_gen(bits) \
+#define EVP_RSA_gen(bits) \
     EVP_PKEY_Q_keygen(NULL, NULL, "RSA", (size_t)(0 + (bits)))
 
 /* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED_0_9_8
-OSSL_DEPRECATEDIN_0_9_8 RSA *RSA_generate_key(int bits, unsigned long e, void
-                                              (*callback) (int, int, void *),
-                                              void *cb_arg);
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_0_9_8
+OSSL_DEPRECATEDIN_0_9_8 RSA *RSA_generate_key(int bits, unsigned long e, void (*callback)(int, int, void *),
+    void *cb_arg);
+#endif
 
 /* New version */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e,
-                                              BN_GENCB *cb);
+    BN_GENCB *cb);
 /* Multi-prime version */
 OSSL_DEPRECATEDIN_3_0 int RSA_generate_multi_prime_key(RSA *rsa, int bits,
-                                                       int primes, BIGNUM *e,
-                                                       BN_GENCB *cb);
+    int primes, BIGNUM *e,
+    BN_GENCB *cb);
 
 OSSL_DEPRECATEDIN_3_0
 int RSA_X931_derive_ex(RSA *rsa, BIGNUM *p1, BIGNUM *p2,
-                       BIGNUM *q1, BIGNUM *q2,
-                       const BIGNUM *Xp1, const BIGNUM *Xp2,
-                       const BIGNUM *Xp, const BIGNUM *Xq1,
-                       const BIGNUM *Xq2, const BIGNUM *Xq,
-                       const BIGNUM *e, BN_GENCB *cb);
+    BIGNUM *q1, BIGNUM *q2,
+    const BIGNUM *Xp1, const BIGNUM *Xp2,
+    const BIGNUM *Xp, const BIGNUM *Xq1,
+    const BIGNUM *Xq2, const BIGNUM *Xq,
+    const BIGNUM *e, BN_GENCB *cb);
 OSSL_DEPRECATEDIN_3_0 int RSA_X931_generate_key_ex(RSA *rsa, int bits,
-                                                   const BIGNUM *e,
-                                                   BN_GENCB *cb);
+    const BIGNUM *e,
+    BN_GENCB *cb);
 
 OSSL_DEPRECATEDIN_3_0 int RSA_check_key(const RSA *);
 OSSL_DEPRECATEDIN_3_0 int RSA_check_key_ex(const RSA *, BN_GENCB *cb);
-        /* next 4 return -1 on error */
+/* next 4 return -1 on error */
 OSSL_DEPRECATEDIN_3_0
 int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
-                       RSA *rsa, int padding);
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
-                        RSA *rsa, int padding);
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
-                       RSA *rsa, int padding);
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_private_decrypt(int flen, const unsigned char *from, unsigned char *to,
-                        RSA *rsa, int padding);
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0 void RSA_free(RSA *r);
 /* "up" the RSA object's reference count */
 OSSL_DEPRECATEDIN_3_0 int RSA_up_ref(RSA *r);
@@ -316,10 +315,10 @@ OSSL_DEPRECATEDIN_3_0 int RSA_set_method(RSA *rsa, const RSA_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 const RSA_METHOD *RSA_PKCS1_OpenSSL(void);
 
 DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr(OSSL_DEPRECATEDIN_3_0,
-                                        RSA, RSAPublicKey)
+    RSA, RSAPublicKey)
 DECLARE_ASN1_ENCODE_FUNCTIONS_name_attr(OSSL_DEPRECATEDIN_3_0,
-                                        RSA, RSAPrivateKey)
-# endif  /* !OPENSSL_NO_DEPRECATED_3_0 */
+    RSA, RSAPrivateKey)
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 
 int RSA_pkey_ctx_ctrl(EVP_PKEY_CTX *ctx, int optype, int cmd, int p1, void *p2);
 
@@ -345,10 +344,10 @@ typedef struct rsa_oaep_params_st {
 
 DECLARE_ASN1_FUNCTIONS(RSA_OAEP_PARAMS)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_STDIO
 OSSL_DEPRECATEDIN_3_0 int RSA_print_fp(FILE *fp, const RSA *r, int offset);
-#  endif
+#endif
 
 OSSL_DEPRECATEDIN_3_0 int RSA_print(BIO *bp, const RSA *r, int offset);
 
@@ -357,12 +356,12 @@ OSSL_DEPRECATEDIN_3_0 int RSA_print(BIO *bp, const RSA *r, int offset);
  * PKCS#1 padded RSA encryption
  */
 OSSL_DEPRECATEDIN_3_0 int RSA_sign(int type, const unsigned char *m,
-                                   unsigned int m_length, unsigned char *sigret,
-                                   unsigned int *siglen, RSA *rsa);
+    unsigned int m_length, unsigned char *sigret,
+    unsigned int *siglen, RSA *rsa);
 OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m,
-                                     unsigned int m_length,
-                                     const unsigned char *sigbuf,
-                                     unsigned int siglen, RSA *rsa);
+    unsigned int m_length,
+    const unsigned char *sigbuf,
+    unsigned int siglen, RSA *rsa);
 
 /*
  * The following 2 function sign and verify a ASN1_OCTET_STRING object inside
@@ -370,14 +369,14 @@ OSSL_DEPRECATEDIN_3_0 int RSA_verify(int type, const unsigned char *m,
  */
 OSSL_DEPRECATEDIN_3_0
 int RSA_sign_ASN1_OCTET_STRING(int type,
-                               const unsigned char *m, unsigned int m_length,
-                               unsigned char *sigret, unsigned int *siglen,
-                               RSA *rsa);
+    const unsigned char *m, unsigned int m_length,
+    unsigned char *sigret, unsigned int *siglen,
+    RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
 int RSA_verify_ASN1_OCTET_STRING(int type,
-                                 const unsigned char *m, unsigned int m_length,
-                                 unsigned char *sigbuf, unsigned int siglen,
-                                 RSA *rsa);
+    const unsigned char *m, unsigned int m_length,
+    unsigned char *sigbuf, unsigned int siglen,
+    RSA *rsa);
 
 OSSL_DEPRECATEDIN_3_0 int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 void RSA_blinding_off(RSA *rsa);
@@ -385,73 +384,73 @@ OSSL_DEPRECATEDIN_3_0 BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
 
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
+    const unsigned char *f, int fl);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
+    const unsigned char *f, int fl,
+    int rsa_len);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
+    const unsigned char *f, int fl);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
+    const unsigned char *f, int fl,
+    int rsa_len);
 OSSL_DEPRECATEDIN_3_0 int PKCS1_MGF1(unsigned char *mask, long len,
-                                     const unsigned char *seed, long seedlen,
-                                     const EVP_MD *dgst);
+    const unsigned char *seed, long seedlen,
+    const EVP_MD *dgst);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
-                               const unsigned char *f, int fl,
-                               const unsigned char *p, int pl);
+    const unsigned char *f, int fl,
+    const unsigned char *p, int pl);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl, int rsa_len,
-                                 const unsigned char *p, int pl);
+    const unsigned char *f, int fl, int rsa_len,
+    const unsigned char *p, int pl);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-                                    const unsigned char *from, int flen,
-                                    const unsigned char *param, int plen,
-                                    const EVP_MD *md, const EVP_MD *mgf1md);
+    const unsigned char *from, int flen,
+    const unsigned char *param, int plen,
+    const EVP_MD *md, const EVP_MD *mgf1md);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_check_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-                                      const unsigned char *from, int flen,
-                                      int num,
-                                      const unsigned char *param, int plen,
-                                      const EVP_MD *md, const EVP_MD *mgf1md);
+    const unsigned char *from, int flen,
+    int num,
+    const unsigned char *param, int plen,
+    const EVP_MD *md, const EVP_MD *mgf1md);
 OSSL_DEPRECATEDIN_3_0 int RSA_padding_add_none(unsigned char *to, int tlen,
-                                               const unsigned char *f, int fl);
+    const unsigned char *f, int fl);
 OSSL_DEPRECATEDIN_3_0 int RSA_padding_check_none(unsigned char *to, int tlen,
-                                                 const unsigned char *f, int fl,
-                                                 int rsa_len);
+    const unsigned char *f, int fl,
+    int rsa_len);
 OSSL_DEPRECATEDIN_3_0 int RSA_padding_add_X931(unsigned char *to, int tlen,
-                                               const unsigned char *f, int fl);
+    const unsigned char *f, int fl);
 OSSL_DEPRECATEDIN_3_0 int RSA_padding_check_X931(unsigned char *to, int tlen,
-                                                 const unsigned char *f, int fl,
-                                                 int rsa_len);
+    const unsigned char *f, int fl,
+    int rsa_len);
 OSSL_DEPRECATEDIN_3_0 int RSA_X931_hash_id(int nid);
 
 OSSL_DEPRECATEDIN_3_0
 int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
-                         const EVP_MD *Hash, const unsigned char *EM,
-                         int sLen);
+    const EVP_MD *Hash, const unsigned char *EM,
+    int sLen);
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
-                              const unsigned char *mHash, const EVP_MD *Hash,
-                              int sLen);
+    const unsigned char *mHash, const EVP_MD *Hash,
+    int sLen);
 
 OSSL_DEPRECATEDIN_3_0
 int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
-                              const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                              const unsigned char *EM, int sLen);
+    const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+    const unsigned char *EM, int sLen);
 
 OSSL_DEPRECATEDIN_3_0
 int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
-                                   const unsigned char *mHash,
-                                   const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                                   int sLen);
+    const unsigned char *mHash,
+    const EVP_MD *Hash, const EVP_MD *mgf1Hash,
+    int sLen);
 
-# define RSA_get_ex_new_index(l, p, newf, dupf, freef) \
+#define RSA_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_RSA, l, p, newf, dupf, freef)
 OSSL_DEPRECATEDIN_3_0 int RSA_set_ex_data(RSA *r, int idx, void *arg);
 OSSL_DEPRECATEDIN_3_0 void *RSA_get_ex_data(const RSA *r, int idx);
@@ -466,7 +465,7 @@ DECLARE_ASN1_DUP_FUNCTION_name_attr(OSSL_DEPRECATEDIN_3_0, RSA, RSAPrivateKey)
  * result is compliant.
  */
 
-#  define RSA_FLAG_FIPS_METHOD                    0x0400
+#define RSA_FLAG_FIPS_METHOD 0x0400
 
 /*
  * If this flag is set the operations normally disabled in FIPS mode are
@@ -474,142 +473,142 @@ DECLARE_ASN1_DUP_FUNCTION_name_attr(OSSL_DEPRECATEDIN_3_0, RSA, RSAPrivateKey)
  * usage is compliant.
  */
 
-#  define RSA_FLAG_NON_FIPS_ALLOW                 0x0400
+#define RSA_FLAG_NON_FIPS_ALLOW 0x0400
 /*
  * Application has decided PRNG is good enough to generate a key: don't
  * check.
  */
-#  define RSA_FLAG_CHECKED                        0x0800
+#define RSA_FLAG_CHECKED 0x0800
 
 OSSL_DEPRECATEDIN_3_0 RSA_METHOD *RSA_meth_new(const char *name, int flags);
 OSSL_DEPRECATEDIN_3_0 void RSA_meth_free(RSA_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 const char *RSA_meth_get0_name(const RSA_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 int RSA_meth_set1_name(RSA_METHOD *meth,
-                                             const char *name);
+    const char *name);
 OSSL_DEPRECATEDIN_3_0 int RSA_meth_get_flags(const RSA_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 int RSA_meth_set_flags(RSA_METHOD *meth, int flags);
 OSSL_DEPRECATEDIN_3_0 void *RSA_meth_get0_app_data(const RSA_METHOD *meth);
 OSSL_DEPRECATEDIN_3_0 int RSA_meth_set0_app_data(RSA_METHOD *meth,
-                                                 void *app_data);
+    void *app_data);
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth)) (int flen,
-                                                     const unsigned char *from,
-                                                     unsigned char *to,
-                                                     RSA *rsa, int padding);
+int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth))(int flen,
+    const unsigned char *from,
+    unsigned char *to,
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_pub_enc(RSA_METHOD *rsa,
-                         int (*pub_enc) (int flen, const unsigned char *from,
-                                         unsigned char *to, RSA *rsa,
-                                         int padding));
+    int (*pub_enc)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa,
+        int padding));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth)) (int flen,
-                                                     const unsigned char *from,
-                                                     unsigned char *to,
-                                                     RSA *rsa, int padding);
+int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth))(int flen,
+    const unsigned char *from,
+    unsigned char *to,
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_pub_dec(RSA_METHOD *rsa,
-                         int (*pub_dec) (int flen, const unsigned char *from,
-                                         unsigned char *to, RSA *rsa,
-                                         int padding));
+    int (*pub_dec)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa,
+        int padding));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth)) (int flen,
-                                                      const unsigned char *from,
-                                                      unsigned char *to,
-                                                      RSA *rsa, int padding);
+int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))(int flen,
+    const unsigned char *from,
+    unsigned char *to,
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_priv_enc(RSA_METHOD *rsa,
-                          int (*priv_enc) (int flen, const unsigned char *from,
-                                           unsigned char *to, RSA *rsa,
-                                           int padding));
+    int (*priv_enc)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa,
+        int padding));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth)) (int flen,
-                                                      const unsigned char *from,
-                                                      unsigned char *to,
-                                                      RSA *rsa, int padding);
+int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth))(int flen,
+    const unsigned char *from,
+    unsigned char *to,
+    RSA *rsa, int padding);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_priv_dec(RSA_METHOD *rsa,
-                          int (*priv_dec) (int flen, const unsigned char *from,
-                                           unsigned char *to, RSA *rsa,
-                                           int padding));
+    int (*priv_dec)(int flen, const unsigned char *from,
+        unsigned char *to, RSA *rsa,
+        int padding));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) (BIGNUM *r0,
-                                                     const BIGNUM *i,
-                                                     RSA *rsa, BN_CTX *ctx);
+int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))(BIGNUM *r0,
+    const BIGNUM *i,
+    RSA *rsa, BN_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_mod_exp(RSA_METHOD *rsa,
-                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa,
-                                         BN_CTX *ctx));
+    int (*mod_exp)(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
+        BN_CTX *ctx));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth)) (BIGNUM *r,
-                                                        const BIGNUM *a,
-                                                        const BIGNUM *p,
-                                                        const BIGNUM *m,
-                                                        BN_CTX *ctx,
-                                                        BN_MONT_CTX *m_ctx);
+int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))(BIGNUM *r,
+    const BIGNUM *a,
+    const BIGNUM *p,
+    const BIGNUM *m,
+    BN_CTX *ctx,
+    BN_MONT_CTX *m_ctx);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_bn_mod_exp(RSA_METHOD *rsa,
-                            int (*bn_mod_exp) (BIGNUM *r,
-                                               const BIGNUM *a,
-                                               const BIGNUM *p,
-                                               const BIGNUM *m,
-                                               BN_CTX *ctx,
-                                               BN_MONT_CTX *m_ctx));
+    int (*bn_mod_exp)(BIGNUM *r,
+        const BIGNUM *a,
+        const BIGNUM *p,
+        const BIGNUM *m,
+        BN_CTX *ctx,
+        BN_MONT_CTX *m_ctx));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa);
+int (*RSA_meth_get_init(const RSA_METHOD *meth))(RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
-int RSA_meth_set_init(RSA_METHOD *rsa, int (*init) (RSA *rsa));
+int RSA_meth_set_init(RSA_METHOD *rsa, int (*init)(RSA *rsa));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa);
+int (*RSA_meth_get_finish(const RSA_METHOD *meth))(RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
-int RSA_meth_set_finish(RSA_METHOD *rsa, int (*finish) (RSA *rsa));
+int RSA_meth_set_finish(RSA_METHOD *rsa, int (*finish)(RSA *rsa));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_sign(const RSA_METHOD *meth)) (int type,
-                                                  const unsigned char *m,
-                                                  unsigned int m_length,
-                                                  unsigned char *sigret,
-                                                  unsigned int *siglen,
-                                                  const RSA *rsa);
+int (*RSA_meth_get_sign(const RSA_METHOD *meth))(int type,
+    const unsigned char *m,
+    unsigned int m_length,
+    unsigned char *sigret,
+    unsigned int *siglen,
+    const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_sign(RSA_METHOD *rsa,
-                      int (*sign) (int type, const unsigned char *m,
-                                   unsigned int m_length,
-                                   unsigned char *sigret, unsigned int *siglen,
-                                   const RSA *rsa));
+    int (*sign)(int type, const unsigned char *m,
+        unsigned int m_length,
+        unsigned char *sigret, unsigned int *siglen,
+        const RSA *rsa));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_verify(const RSA_METHOD *meth)) (int dtype,
-                                                    const unsigned char *m,
-                                                    unsigned int m_length,
-                                                    const unsigned char *sigbuf,
-                                                    unsigned int siglen,
-                                                    const RSA *rsa);
+int (*RSA_meth_get_verify(const RSA_METHOD *meth))(int dtype,
+    const unsigned char *m,
+    unsigned int m_length,
+    const unsigned char *sigbuf,
+    unsigned int siglen,
+    const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_verify(RSA_METHOD *rsa,
-                        int (*verify) (int dtype, const unsigned char *m,
-                                       unsigned int m_length,
-                                       const unsigned char *sigbuf,
-                                       unsigned int siglen, const RSA *rsa));
+    int (*verify)(int dtype, const unsigned char *m,
+        unsigned int m_length,
+        const unsigned char *sigbuf,
+        unsigned int siglen, const RSA *rsa));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_keygen(const RSA_METHOD *meth)) (RSA *rsa, int bits,
-                                                    BIGNUM *e, BN_GENCB *cb);
+int (*RSA_meth_get_keygen(const RSA_METHOD *meth))(RSA *rsa, int bits,
+    BIGNUM *e, BN_GENCB *cb);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_keygen(RSA_METHOD *rsa,
-                        int (*keygen) (RSA *rsa, int bits, BIGNUM *e,
-                                       BN_GENCB *cb));
+    int (*keygen)(RSA *rsa, int bits, BIGNUM *e,
+        BN_GENCB *cb));
 OSSL_DEPRECATEDIN_3_0
-int (*RSA_meth_get_multi_prime_keygen(const RSA_METHOD *meth)) (RSA *rsa,
-                                                                int bits,
-                                                                int primes,
-                                                                BIGNUM *e,
-                                                                BN_GENCB *cb);
+int (*RSA_meth_get_multi_prime_keygen(const RSA_METHOD *meth))(RSA *rsa,
+    int bits,
+    int primes,
+    BIGNUM *e,
+    BN_GENCB *cb);
 OSSL_DEPRECATEDIN_3_0
 int RSA_meth_set_multi_prime_keygen(RSA_METHOD *meth,
-                                    int (*keygen) (RSA *rsa, int bits,
-                                                   int primes, BIGNUM *e,
-                                                   BN_GENCB *cb));
-#endif  /* !OPENSSL_NO_DEPRECATED_3_0 */
+    int (*keygen)(RSA *rsa, int bits,
+        int primes, BIGNUM *e,
+        BN_GENCB *cb));
+#endif /* !OPENSSL_NO_DEPRECATED_3_0 */
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index c58463c7c19f..8432f5f6552d 100644
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -9,99 +9,97 @@
  */
 
 #ifndef OPENSSL_RSAERR_H
-# define OPENSSL_RSAERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_RSAERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * RSA reason codes.
  */
-# define RSA_R_ALGORITHM_MISMATCH                         100
-# define RSA_R_BAD_E_VALUE                                101
-# define RSA_R_BAD_FIXED_HEADER_DECRYPT                   102
-# define RSA_R_BAD_PAD_BYTE_COUNT                         103
-# define RSA_R_BAD_SIGNATURE                              104
-# define RSA_R_BLOCK_TYPE_IS_NOT_01                       106
-# define RSA_R_BLOCK_TYPE_IS_NOT_02                       107
-# define RSA_R_DATA_GREATER_THAN_MOD_LEN                  108
-# define RSA_R_DATA_TOO_LARGE                             109
-# define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                110
-# define RSA_R_DATA_TOO_LARGE_FOR_MODULUS                 132
-# define RSA_R_DATA_TOO_SMALL                             111
-# define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE                122
-# define RSA_R_DIGEST_DOES_NOT_MATCH                      158
-# define RSA_R_DIGEST_NOT_ALLOWED                         145
-# define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
-# define RSA_R_DMP1_NOT_CONGRUENT_TO_D                    124
-# define RSA_R_DMQ1_NOT_CONGRUENT_TO_D                    125
-# define RSA_R_D_E_NOT_CONGRUENT_TO_1                     123
-# define RSA_R_FIRST_OCTET_INVALID                        133
-# define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE        144
-# define RSA_R_INVALID_DIGEST                             157
-# define RSA_R_INVALID_DIGEST_LENGTH                      143
-# define RSA_R_INVALID_HEADER                             137
-# define RSA_R_INVALID_KEYPAIR                            171
-# define RSA_R_INVALID_KEY_LENGTH                         173
-# define RSA_R_INVALID_LABEL                              160
-# define RSA_R_INVALID_LENGTH                             181
-# define RSA_R_INVALID_MESSAGE_LENGTH                     131
-# define RSA_R_INVALID_MGF1_MD                            156
-# define RSA_R_INVALID_MODULUS                            174
-# define RSA_R_INVALID_MULTI_PRIME_KEY                    167
-# define RSA_R_INVALID_OAEP_PARAMETERS                    161
-# define RSA_R_INVALID_PADDING                            138
-# define RSA_R_INVALID_PADDING_MODE                       141
-# define RSA_R_INVALID_PSS_PARAMETERS                     149
-# define RSA_R_INVALID_PSS_SALTLEN                        146
-# define RSA_R_INVALID_REQUEST                            175
-# define RSA_R_INVALID_SALT_LENGTH                        150
-# define RSA_R_INVALID_STRENGTH                           176
-# define RSA_R_INVALID_TRAILER                            139
-# define RSA_R_INVALID_X931_DIGEST                        142
-# define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
-# define RSA_R_KEY_PRIME_NUM_INVALID                      165
-# define RSA_R_KEY_SIZE_TOO_SMALL                         120
-# define RSA_R_LAST_OCTET_INVALID                         134
-# define RSA_R_MGF1_DIGEST_NOT_ALLOWED                    152
-# define RSA_R_MISSING_PRIVATE_KEY                        179
-# define RSA_R_MODULUS_TOO_LARGE                          105
-# define RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R            168
-# define RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D             169
-# define RSA_R_MP_R_NOT_PRIME                             170
-# define RSA_R_NO_PUBLIC_EXPONENT                         140
-# define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
-# define RSA_R_N_DOES_NOT_EQUAL_PRODUCT_OF_PRIMES         172
-# define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
-# define RSA_R_OAEP_DECODING_ERROR                        121
-# define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   148
-# define RSA_R_PADDING_CHECK_FAILED                       114
-# define RSA_R_PAIRWISE_TEST_FAILURE                      177
-# define RSA_R_PKCS_DECODING_ERROR                        159
-# define RSA_R_PSS_SALTLEN_TOO_SMALL                      164
-# define RSA_R_PUB_EXPONENT_OUT_OF_RANGE                  178
-# define RSA_R_P_NOT_PRIME                                128
-# define RSA_R_Q_NOT_PRIME                                129
-# define RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT    180
-# define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED               130
-# define RSA_R_SLEN_CHECK_FAILED                          136
-# define RSA_R_SLEN_RECOVERY_FAILED                       135
-# define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
-# define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
-# define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
-# define RSA_R_UNKNOWN_DIGEST                             166
-# define RSA_R_UNKNOWN_MASK_DIGEST                        151
-# define RSA_R_UNKNOWN_PADDING_TYPE                       118
-# define RSA_R_UNSUPPORTED_ENCRYPTION_TYPE                162
-# define RSA_R_UNSUPPORTED_LABEL_SOURCE                   163
-# define RSA_R_UNSUPPORTED_MASK_ALGORITHM                 153
-# define RSA_R_UNSUPPORTED_MASK_PARAMETER                 154
-# define RSA_R_UNSUPPORTED_SIGNATURE_TYPE                 155
-# define RSA_R_VALUE_MISSING                              147
-# define RSA_R_WRONG_SIGNATURE_LENGTH                     119
+#define RSA_R_ALGORITHM_MISMATCH 100
+#define RSA_R_BAD_E_VALUE 101
+#define RSA_R_BAD_FIXED_HEADER_DECRYPT 102
+#define RSA_R_BAD_PAD_BYTE_COUNT 103
+#define RSA_R_BAD_SIGNATURE 104
+#define RSA_R_BLOCK_TYPE_IS_NOT_01 106
+#define RSA_R_BLOCK_TYPE_IS_NOT_02 107
+#define RSA_R_DATA_GREATER_THAN_MOD_LEN 108
+#define RSA_R_DATA_TOO_LARGE 109
+#define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE 110
+#define RSA_R_DATA_TOO_LARGE_FOR_MODULUS 132
+#define RSA_R_DATA_TOO_SMALL 111
+#define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE 122
+#define RSA_R_DIGEST_DOES_NOT_MATCH 158
+#define RSA_R_DIGEST_NOT_ALLOWED 145
+#define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY 112
+#define RSA_R_DMP1_NOT_CONGRUENT_TO_D 124
+#define RSA_R_DMQ1_NOT_CONGRUENT_TO_D 125
+#define RSA_R_D_E_NOT_CONGRUENT_TO_1 123
+#define RSA_R_FIRST_OCTET_INVALID 133
+#define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE 144
+#define RSA_R_INVALID_DIGEST 157
+#define RSA_R_INVALID_DIGEST_LENGTH 143
+#define RSA_R_INVALID_HEADER 137
+#define RSA_R_INVALID_KEYPAIR 171
+#define RSA_R_INVALID_KEY_LENGTH 173
+#define RSA_R_INVALID_LABEL 160
+#define RSA_R_INVALID_LENGTH 181
+#define RSA_R_INVALID_MESSAGE_LENGTH 131
+#define RSA_R_INVALID_MGF1_MD 156
+#define RSA_R_INVALID_MODULUS 174
+#define RSA_R_INVALID_MULTI_PRIME_KEY 167
+#define RSA_R_INVALID_OAEP_PARAMETERS 161
+#define RSA_R_INVALID_PADDING 138
+#define RSA_R_INVALID_PADDING_MODE 141
+#define RSA_R_INVALID_PSS_PARAMETERS 149
+#define RSA_R_INVALID_PSS_SALTLEN 146
+#define RSA_R_INVALID_REQUEST 175
+#define RSA_R_INVALID_SALT_LENGTH 150
+#define RSA_R_INVALID_STRENGTH 176
+#define RSA_R_INVALID_TRAILER 139
+#define RSA_R_INVALID_X931_DIGEST 142
+#define RSA_R_IQMP_NOT_INVERSE_OF_Q 126
+#define RSA_R_KEY_PRIME_NUM_INVALID 165
+#define RSA_R_KEY_SIZE_TOO_SMALL 120
+#define RSA_R_LAST_OCTET_INVALID 134
+#define RSA_R_MGF1_DIGEST_NOT_ALLOWED 152
+#define RSA_R_MISSING_PRIVATE_KEY 179
+#define RSA_R_MODULUS_TOO_LARGE 105
+#define RSA_R_MP_COEFFICIENT_NOT_INVERSE_OF_R 168
+#define RSA_R_MP_EXPONENT_NOT_CONGRUENT_TO_D 169
+#define RSA_R_MP_R_NOT_PRIME 170
+#define RSA_R_NO_PUBLIC_EXPONENT 140
+#define RSA_R_NULL_BEFORE_BLOCK_MISSING 113
+#define RSA_R_N_DOES_NOT_EQUAL_PRODUCT_OF_PRIMES 172
+#define RSA_R_N_DOES_NOT_EQUAL_P_Q 127
+#define RSA_R_OAEP_DECODING_ERROR 121
+#define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 148
+#define RSA_R_PADDING_CHECK_FAILED 114
+#define RSA_R_PAIRWISE_TEST_FAILURE 177
+#define RSA_R_PKCS_DECODING_ERROR 159
+#define RSA_R_PSS_SALTLEN_TOO_SMALL 164
+#define RSA_R_PUB_EXPONENT_OUT_OF_RANGE 178
+#define RSA_R_P_NOT_PRIME 128
+#define RSA_R_Q_NOT_PRIME 129
+#define RSA_R_RANDOMNESS_SOURCE_STRENGTH_INSUFFICIENT 180
+#define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED 130
+#define RSA_R_SLEN_CHECK_FAILED 136
+#define RSA_R_SLEN_RECOVERY_FAILED 135
+#define RSA_R_SSLV3_ROLLBACK_ATTACK 115
+#define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
+#define RSA_R_UNKNOWN_ALGORITHM_TYPE 117
+#define RSA_R_UNKNOWN_DIGEST 166
+#define RSA_R_UNKNOWN_MASK_DIGEST 151
+#define RSA_R_UNKNOWN_PADDING_TYPE 118
+#define RSA_R_UNSUPPORTED_ENCRYPTION_TYPE 162
+#define RSA_R_UNSUPPORTED_LABEL_SOURCE 163
+#define RSA_R_UNSUPPORTED_MASK_ALGORITHM 153
+#define RSA_R_UNSUPPORTED_MASK_PARAMETER 154
+#define RSA_R_UNSUPPORTED_SIGNATURE_TYPE 155
+#define RSA_R_VALUE_MISSING 147
+#define RSA_R_WRONG_SIGNATURE_LENGTH 119
 
 #endif
diff --git a/include/openssl/safestack.h.in b/include/openssl/safestack.h.in
index 6b36607928ff..a88409ba4151 100644
--- a/include/openssl/safestack.h.in
+++ b/include/openssl/safestack.h.in
@@ -9,177 +9,179 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_string_macros
                           generate_stack_const_string_macros
                           generate_stack_block_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_SAFESTACK_H
-# define OPENSSL_SAFESTACK_H
-# pragma once
+#define OPENSSL_SAFESTACK_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SAFESTACK_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SAFESTACK_H
+#endif
 
-# include <openssl/stack.h>
-# include <openssl/e_os2.h>
+#include <openssl/stack.h>
+#include <openssl/e_os2.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-# define STACK_OF(type) struct stack_st_##type
+#define STACK_OF(type) struct stack_st_##type
 
 /* Helper macro for internal use */
-# define SKM_DEFINE_STACK_OF_INTERNAL(t1, t2, t3) \
-    STACK_OF(t1); \
-    typedef int (*sk_##t1##_compfunc)(const t3 * const *a, const t3 *const *b); \
-    typedef void (*sk_##t1##_freefunc)(t3 *a); \
-    typedef t3 * (*sk_##t1##_copyfunc)(const t3 *a); \
-    static ossl_unused ossl_inline t2 *ossl_check_##t1##_type(t2 *ptr) \
-    { \
-        return ptr; \
-    } \
+#define SKM_DEFINE_STACK_OF_INTERNAL(t1, t2, t3)                                                                \
+    STACK_OF(t1);                                                                                               \
+    typedef int (*sk_##t1##_compfunc)(const t3 *const *a, const t3 *const *b);                                  \
+    typedef void (*sk_##t1##_freefunc)(t3 * a);                                                                 \
+    typedef t3 *(*sk_##t1##_copyfunc)(const t3 *a);                                                             \
+    static ossl_unused ossl_inline t2 *ossl_check_##t1##_type(t2 *ptr)                                          \
+    {                                                                                                           \
+        return ptr;                                                                                             \
+    }                                                                                                           \
     static ossl_unused ossl_inline const OPENSSL_STACK *ossl_check_const_##t1##_sk_type(const STACK_OF(t1) *sk) \
-    { \
-        return (const OPENSSL_STACK *)sk; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_STACK *ossl_check_##t1##_sk_type(STACK_OF(t1) *sk) \
-    { \
-        return (OPENSSL_STACK *)sk; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_sk_compfunc ossl_check_##t1##_compfunc_type(sk_##t1##_compfunc cmp) \
-    { \
-        return (OPENSSL_sk_compfunc)cmp; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_sk_copyfunc ossl_check_##t1##_copyfunc_type(sk_##t1##_copyfunc cpy) \
-    { \
-        return (OPENSSL_sk_copyfunc)cpy; \
-    } \
-    static ossl_unused ossl_inline OPENSSL_sk_freefunc ossl_check_##t1##_freefunc_type(sk_##t1##_freefunc fr) \
-    { \
-        return (OPENSSL_sk_freefunc)fr; \
+    {                                                                                                           \
+        return (const OPENSSL_STACK *)sk;                                                                       \
+    }                                                                                                           \
+    static ossl_unused ossl_inline OPENSSL_STACK *ossl_check_##t1##_sk_type(STACK_OF(t1) *sk)                   \
+    {                                                                                                           \
+        return (OPENSSL_STACK *)sk;                                                                             \
+    }                                                                                                           \
+    static ossl_unused ossl_inline OPENSSL_sk_compfunc ossl_check_##t1##_compfunc_type(sk_##t1##_compfunc cmp)  \
+    {                                                                                                           \
+        return (OPENSSL_sk_compfunc)cmp;                                                                        \
+    }                                                                                                           \
+    static ossl_unused ossl_inline OPENSSL_sk_copyfunc ossl_check_##t1##_copyfunc_type(sk_##t1##_copyfunc cpy)  \
+    {                                                                                                           \
+        return (OPENSSL_sk_copyfunc)cpy;                                                                        \
+    }                                                                                                           \
+    static ossl_unused ossl_inline OPENSSL_sk_freefunc ossl_check_##t1##_freefunc_type(sk_##t1##_freefunc fr)   \
+    {                                                                                                           \
+        return (OPENSSL_sk_freefunc)fr;                                                                         \
     }
 
-# define SKM_DEFINE_STACK_OF(t1, t2, t3) \
-    STACK_OF(t1); \
-    typedef int (*sk_##t1##_compfunc)(const t3 * const *a, const t3 *const *b); \
-    typedef void (*sk_##t1##_freefunc)(t3 *a); \
-    typedef t3 * (*sk_##t1##_copyfunc)(const t3 *a); \
-    static ossl_unused ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk) \
-    { \
-        return OPENSSL_sk_num((const OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx) \
-    { \
-        return (t2 *)OPENSSL_sk_value((const OPENSSL_STACK *)sk, idx); \
-    } \
-    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new(sk_##t1##_compfunc compare) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new((OPENSSL_sk_compfunc)compare); \
-    } \
-    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new_null(); \
-    } \
-    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_reserve(sk_##t1##_compfunc compare, int n) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_new_reserve((OPENSSL_sk_compfunc)compare, n); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_reserve(STACK_OF(t1) *sk, int n) \
-    { \
-        return OPENSSL_sk_reserve((OPENSSL_STACK *)sk, n); \
-    } \
-    static ossl_unused ossl_inline void sk_##t1##_free(STACK_OF(t1) *sk) \
-    { \
-        OPENSSL_sk_free((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline void sk_##t1##_zero(STACK_OF(t1) *sk) \
-    { \
-        OPENSSL_sk_zero((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i) \
-    { \
-        return (t2 *)OPENSSL_sk_delete((OPENSSL_STACK *)sk, i); \
-    } \
-    static ossl_unused ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return (t2 *)OPENSSL_sk_delete_ptr((OPENSSL_STACK *)sk, \
-                                           (const void *)ptr); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_push((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_unshift(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_unshift((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_unused ossl_inline t2 *sk_##t1##_pop(STACK_OF(t1) *sk) \
-    { \
-        return (t2 *)OPENSSL_sk_pop((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline t2 *sk_##t1##_shift(STACK_OF(t1) *sk) \
-    { \
-        return (t2 *)OPENSSL_sk_shift((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline void sk_##t1##_pop_free(STACK_OF(t1) *sk, sk_##t1##_freefunc freefunc) \
-    { \
-        OPENSSL_sk_pop_free((OPENSSL_STACK *)sk, (OPENSSL_sk_freefunc)freefunc); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx) \
-    { \
-        return OPENSSL_sk_insert((OPENSSL_STACK *)sk, (const void *)ptr, idx); \
-    } \
-    static ossl_unused ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr) \
-    { \
-        return (t2 *)OPENSSL_sk_set((OPENSSL_STACK *)sk, idx, (const void *)ptr); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_find((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_find_ex(STACK_OF(t1) *sk, t2 *ptr) \
-    { \
-        return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (const void *)ptr); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_find_all(STACK_OF(t1) *sk, t2 *ptr, int *pnum) \
-    { \
-        return OPENSSL_sk_find_all((OPENSSL_STACK *)sk, (const void *)ptr, pnum); \
-    } \
-    static ossl_unused ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk) \
-    { \
-        OPENSSL_sk_sort((OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline int sk_##t1##_is_sorted(const STACK_OF(t1) *sk) \
-    { \
-        return OPENSSL_sk_is_sorted((const OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline STACK_OF(t1) * sk_##t1##_dup(const STACK_OF(t1) *sk) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_dup((const OPENSSL_STACK *)sk); \
-    } \
-    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_deep_copy(const STACK_OF(t1) *sk, \
-                                                    sk_##t1##_copyfunc copyfunc, \
-                                                    sk_##t1##_freefunc freefunc) \
-    { \
-        return (STACK_OF(t1) *)OPENSSL_sk_deep_copy((const OPENSSL_STACK *)sk, \
-                                            (OPENSSL_sk_copyfunc)copyfunc, \
-                                            (OPENSSL_sk_freefunc)freefunc); \
-    } \
+#define SKM_DEFINE_STACK_OF(t1, t2, t3)                                                                                    \
+    STACK_OF(t1);                                                                                                          \
+    typedef int (*sk_##t1##_compfunc)(const t3 *const *a, const t3 *const *b);                                             \
+    typedef void (*sk_##t1##_freefunc)(t3 * a);                                                                            \
+    typedef t3 *(*sk_##t1##_copyfunc)(const t3 *a);                                                                        \
+    static ossl_unused ossl_inline int sk_##t1##_num(const STACK_OF(t1) *sk)                                               \
+    {                                                                                                                      \
+        return OPENSSL_sk_num((const OPENSSL_STACK *)sk);                                                                  \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline t2 *sk_##t1##_value(const STACK_OF(t1) *sk, int idx)                                    \
+    {                                                                                                                      \
+        return (t2 *)OPENSSL_sk_value((const OPENSSL_STACK *)sk, idx);                                                     \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new(sk_##t1##_compfunc compare)                                 \
+    {                                                                                                                      \
+        return (STACK_OF(t1) *)OPENSSL_sk_new((OPENSSL_sk_compfunc)compare);                                               \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_null(void)                                                  \
+    {                                                                                                                      \
+        return (STACK_OF(t1) *)OPENSSL_sk_new_null();                                                                      \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_new_reserve(sk_##t1##_compfunc compare, int n)                  \
+    {                                                                                                                      \
+        return (STACK_OF(t1) *)OPENSSL_sk_new_reserve((OPENSSL_sk_compfunc)compare, n);                                    \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_reserve(STACK_OF(t1) *sk, int n)                                          \
+    {                                                                                                                      \
+        return OPENSSL_sk_reserve((OPENSSL_STACK *)sk, n);                                                                 \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void sk_##t1##_free(STACK_OF(t1) *sk)                                                   \
+    {                                                                                                                      \
+        OPENSSL_sk_free((OPENSSL_STACK *)sk);                                                                              \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void sk_##t1##_zero(STACK_OF(t1) *sk)                                                   \
+    {                                                                                                                      \
+        OPENSSL_sk_zero((OPENSSL_STACK *)sk);                                                                              \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline t2 *sk_##t1##_delete(STACK_OF(t1) *sk, int i)                                           \
+    {                                                                                                                      \
+        return (t2 *)OPENSSL_sk_delete((OPENSSL_STACK *)sk, i);                                                            \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline t2 *sk_##t1##_delete_ptr(STACK_OF(t1) *sk, t2 *ptr)                                     \
+    {                                                                                                                      \
+        return (t2 *)OPENSSL_sk_delete_ptr((OPENSSL_STACK *)sk,                                                            \
+            (const void *)ptr);                                                                                            \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_push(STACK_OF(t1) *sk, t2 *ptr)                                           \
+    {                                                                                                                      \
+        return OPENSSL_sk_push((OPENSSL_STACK *)sk, (const void *)ptr);                                                    \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_unshift(STACK_OF(t1) *sk, t2 *ptr)                                        \
+    {                                                                                                                      \
+        return OPENSSL_sk_unshift((OPENSSL_STACK *)sk, (const void *)ptr);                                                 \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline t2 *sk_##t1##_pop(STACK_OF(t1) *sk)                                                     \
+    {                                                                                                                      \
+        return (t2 *)OPENSSL_sk_pop((OPENSSL_STACK *)sk);                                                                  \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline t2 *sk_##t1##_shift(STACK_OF(t1) *sk)                                                   \
+    {                                                                                                                      \
+        return (t2 *)OPENSSL_sk_shift((OPENSSL_STACK *)sk);                                                                \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void sk_##t1##_pop_free(STACK_OF(t1) *sk, sk_##t1##_freefunc freefunc)                  \
+    {                                                                                                                      \
+        OPENSSL_sk_pop_free((OPENSSL_STACK *)sk, (OPENSSL_sk_freefunc)freefunc);                                           \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_insert(STACK_OF(t1) *sk, t2 *ptr, int idx)                                \
+    {                                                                                                                      \
+        return OPENSSL_sk_insert((OPENSSL_STACK *)sk, (const void *)ptr, idx);                                             \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline t2 *sk_##t1##_set(STACK_OF(t1) *sk, int idx, t2 *ptr)                                   \
+    {                                                                                                                      \
+        return (t2 *)OPENSSL_sk_set((OPENSSL_STACK *)sk, idx, (const void *)ptr);                                          \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_find(STACK_OF(t1) *sk, t2 *ptr)                                           \
+    {                                                                                                                      \
+        return OPENSSL_sk_find((OPENSSL_STACK *)sk, (const void *)ptr);                                                    \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_find_ex(STACK_OF(t1) *sk, t2 *ptr)                                        \
+    {                                                                                                                      \
+        return OPENSSL_sk_find_ex((OPENSSL_STACK *)sk, (const void *)ptr);                                                 \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_find_all(STACK_OF(t1) *sk, t2 *ptr, int *pnum)                            \
+    {                                                                                                                      \
+        return OPENSSL_sk_find_all((OPENSSL_STACK *)sk, (const void *)ptr, pnum);                                          \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline void sk_##t1##_sort(STACK_OF(t1) *sk)                                                   \
+    {                                                                                                                      \
+        OPENSSL_sk_sort((OPENSSL_STACK *)sk);                                                                              \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline int sk_##t1##_is_sorted(const STACK_OF(t1) *sk)                                         \
+    {                                                                                                                      \
+        return OPENSSL_sk_is_sorted((const OPENSSL_STACK *)sk);                                                            \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_dup(const STACK_OF(t1) *sk)                                     \
+    {                                                                                                                      \
+        return (STACK_OF(t1) *)OPENSSL_sk_dup((const OPENSSL_STACK *)sk);                                                  \
+    }                                                                                                                      \
+    static ossl_unused ossl_inline STACK_OF(t1) *sk_##t1##_deep_copy(const STACK_OF(t1) *sk,                               \
+        sk_##t1##_copyfunc copyfunc,                                                                                       \
+        sk_##t1##_freefunc freefunc)                                                                                       \
+    {                                                                                                                      \
+        return (STACK_OF(t1) *)OPENSSL_sk_deep_copy((const OPENSSL_STACK *)sk,                                             \
+            (OPENSSL_sk_copyfunc)copyfunc,                                                                                 \
+            (OPENSSL_sk_freefunc)freefunc);                                                                                \
+    }                                                                                                                      \
     static ossl_unused ossl_inline sk_##t1##_compfunc sk_##t1##_set_cmp_func(STACK_OF(t1) *sk, sk_##t1##_compfunc compare) \
-    { \
-        return (sk_##t1##_compfunc)OPENSSL_sk_set_cmp_func((OPENSSL_STACK *)sk, (OPENSSL_sk_compfunc)compare); \
+    {                                                                                                                      \
+        return (sk_##t1##_compfunc)OPENSSL_sk_set_cmp_func((OPENSSL_STACK *)sk, (OPENSSL_sk_compfunc)compare);             \
     }
 
-# define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
-# define DEFINE_STACK_OF_CONST(t) SKM_DEFINE_STACK_OF(t, const t, t)
-# define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2)
-# define DEFINE_SPECIAL_STACK_OF_CONST(t1, t2) \
-            SKM_DEFINE_STACK_OF(t1, const t2, t2)
+#define DEFINE_STACK_OF(t) SKM_DEFINE_STACK_OF(t, t, t)
+#define DEFINE_STACK_OF_CONST(t) SKM_DEFINE_STACK_OF(t, const t, t)
+#define DEFINE_SPECIAL_STACK_OF(t1, t2) SKM_DEFINE_STACK_OF(t1, t2, t2)
+#define DEFINE_SPECIAL_STACK_OF_CONST(t1, t2) \
+    SKM_DEFINE_STACK_OF(t1, const t2, t2)
 
 /*-
  * Strings are special: normally an lhash entry will point to a single
@@ -205,10 +207,12 @@ typedef const char *OPENSSL_CSTRING;
  * chars. So, we have to implement STRING specially for STACK_OF. This is
  * dealt with in the autogenerated macros below.
  */
+/* clang-format off */
 {-
     generate_stack_string_macros()
     .generate_stack_const_string_macros();
 -}
+/* clang-format on */
 
 #if !defined(OPENSSL_NO_DEPRECATED_3_0)
 /*
@@ -216,12 +220,14 @@ typedef const char *OPENSSL_CSTRING;
  * These should also be distinguished from "normal" stacks.
  */
 typedef void *OPENSSL_BLOCK;
+/* clang-format off */
 {-
     generate_stack_block_macros();
 -}
+/* clang-format on */
 #endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/seed.h b/include/openssl/seed.h
index edb218ae6e2d..8c2b20a4d801 100644
--- a/include/openssl/seed.h
+++ b/include/openssl/seed.h
@@ -33,81 +33,80 @@
  */
 
 #ifndef OPENSSL_SEED_H
-# define OPENSSL_SEED_H
-# pragma once
+#define OPENSSL_SEED_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SEED_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SEED_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_SEED
-#  include <openssl/e_os2.h>
-#  include <openssl/crypto.h>
-#  include <sys/types.h>
+#ifndef OPENSSL_NO_SEED
+#include <openssl/e_os2.h>
+#include <openssl/crypto.h>
+#include <sys/types.h>
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define SEED_BLOCK_SIZE 16
-#  define SEED_KEY_LENGTH 16
+#define SEED_BLOCK_SIZE 16
+#define SEED_KEY_LENGTH 16
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* look whether we need 'long' to get 32 bits */
-#   ifdef AES_LONG
-#    ifndef SEED_LONG
-#     define SEED_LONG 1
-#    endif
-#   endif
-
+#ifdef AES_LONG
+#ifndef SEED_LONG
+#define SEED_LONG 1
+#endif
+#endif
 
 typedef struct seed_key_st {
-#   ifdef SEED_LONG
+#ifdef SEED_LONG
     unsigned long data[32];
-#   else
+#else
     unsigned int data[32];
-#   endif
+#endif
 } SEED_KEY_SCHEDULE;
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                  SEED_KEY_SCHEDULE *ks);
+    SEED_KEY_SCHEDULE *ks);
 OSSL_DEPRECATEDIN_3_0
 void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                  unsigned char d[SEED_BLOCK_SIZE],
-                  const SEED_KEY_SCHEDULE *ks);
+    unsigned char d[SEED_BLOCK_SIZE],
+    const SEED_KEY_SCHEDULE *ks);
 OSSL_DEPRECATEDIN_3_0
 void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                  unsigned char d[SEED_BLOCK_SIZE],
-                  const SEED_KEY_SCHEDULE *ks);
+    unsigned char d[SEED_BLOCK_SIZE],
+    const SEED_KEY_SCHEDULE *ks);
 OSSL_DEPRECATEDIN_3_0
 void SEED_ecb_encrypt(const unsigned char *in,
-                      unsigned char *out,
-                      const SEED_KEY_SCHEDULE *ks, int enc);
+    unsigned char *out,
+    const SEED_KEY_SCHEDULE *ks, int enc);
 OSSL_DEPRECATEDIN_3_0
 void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out, size_t len,
-                      const SEED_KEY_SCHEDULE *ks,
-                      unsigned char ivec[SEED_BLOCK_SIZE],
-                      int enc);
+    const SEED_KEY_SCHEDULE *ks,
+    unsigned char ivec[SEED_BLOCK_SIZE],
+    int enc);
 OSSL_DEPRECATEDIN_3_0
 void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivec[SEED_BLOCK_SIZE],
-                         int *num, int enc);
+    size_t len, const SEED_KEY_SCHEDULE *ks,
+    unsigned char ivec[SEED_BLOCK_SIZE],
+    int *num, int enc);
 OSSL_DEPRECATEDIN_3_0
 void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivec[SEED_BLOCK_SIZE],
-                         int *num);
-#  endif
+    size_t len, const SEED_KEY_SCHEDULE *ks,
+    unsigned char ivec[SEED_BLOCK_SIZE],
+    int *num);
+#endif
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h
index 6c81cef4c300..de736794a99a 100644
--- a/include/openssl/self_test.h
+++ b/include/openssl/self_test.h
@@ -8,107 +8,107 @@
  */
 
 #ifndef OPENSSL_SELF_TEST_H
-# define OPENSSL_SELF_TEST_H
-# pragma once
+#define OPENSSL_SELF_TEST_H
+#pragma once
 
-# include <openssl/core.h> /* OSSL_CALLBACK */
+#include <openssl/core.h> /* OSSL_CALLBACK */
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /* The test event phases */
-# define OSSL_SELF_TEST_PHASE_NONE     "None"
-# define OSSL_SELF_TEST_PHASE_START    "Start"
-# define OSSL_SELF_TEST_PHASE_CORRUPT  "Corrupt"
-# define OSSL_SELF_TEST_PHASE_PASS     "Pass"
-# define OSSL_SELF_TEST_PHASE_FAIL     "Fail"
+#define OSSL_SELF_TEST_PHASE_NONE "None"
+#define OSSL_SELF_TEST_PHASE_START "Start"
+#define OSSL_SELF_TEST_PHASE_CORRUPT "Corrupt"
+#define OSSL_SELF_TEST_PHASE_PASS "Pass"
+#define OSSL_SELF_TEST_PHASE_FAIL "Fail"
 
 /* Test event categories */
-# define OSSL_SELF_TEST_TYPE_NONE               "None"
-# define OSSL_SELF_TEST_TYPE_MODULE_INTEGRITY   "Module_Integrity"
-# define OSSL_SELF_TEST_TYPE_INSTALL_INTEGRITY  "Install_Integrity"
-# define OSSL_SELF_TEST_TYPE_CRNG               "Continuous_RNG_Test"
-# define OSSL_SELF_TEST_TYPE_PCT                "Conditional_PCT"
-# define OSSL_SELF_TEST_TYPE_PCT_KAT            "Conditional_KAT"
-# define OSSL_SELF_TEST_TYPE_PCT_IMPORT         "Import_PCT"
-# define OSSL_SELF_TEST_TYPE_KAT_INTEGRITY      "KAT_Integrity"
-# define OSSL_SELF_TEST_TYPE_KAT_CIPHER         "KAT_Cipher"
-# define OSSL_SELF_TEST_TYPE_KAT_ASYM_CIPHER    "KAT_AsymmetricCipher"
-# define OSSL_SELF_TEST_TYPE_KAT_ASYM_KEYGEN    "KAT_AsymmetricKeyGeneration"
-# define OSSL_SELF_TEST_TYPE_KAT_KEM            "KAT_KEM"
-# define OSSL_SELF_TEST_TYPE_KAT_DIGEST         "KAT_Digest"
-# define OSSL_SELF_TEST_TYPE_KAT_SIGNATURE      "KAT_Signature"
-# define OSSL_SELF_TEST_TYPE_PCT_SIGNATURE      "PCT_Signature"
-# define OSSL_SELF_TEST_TYPE_KAT_KDF            "KAT_KDF"
-# define OSSL_SELF_TEST_TYPE_KAT_KA             "KAT_KA"
-# define OSSL_SELF_TEST_TYPE_DRBG               "DRBG"
+#define OSSL_SELF_TEST_TYPE_NONE "None"
+#define OSSL_SELF_TEST_TYPE_MODULE_INTEGRITY "Module_Integrity"
+#define OSSL_SELF_TEST_TYPE_INSTALL_INTEGRITY "Install_Integrity"
+#define OSSL_SELF_TEST_TYPE_CRNG "Continuous_RNG_Test"
+#define OSSL_SELF_TEST_TYPE_PCT "Conditional_PCT"
+#define OSSL_SELF_TEST_TYPE_PCT_KAT "Conditional_KAT"
+#define OSSL_SELF_TEST_TYPE_PCT_IMPORT "Import_PCT"
+#define OSSL_SELF_TEST_TYPE_KAT_INTEGRITY "KAT_Integrity"
+#define OSSL_SELF_TEST_TYPE_KAT_CIPHER "KAT_Cipher"
+#define OSSL_SELF_TEST_TYPE_KAT_ASYM_CIPHER "KAT_AsymmetricCipher"
+#define OSSL_SELF_TEST_TYPE_KAT_ASYM_KEYGEN "KAT_AsymmetricKeyGeneration"
+#define OSSL_SELF_TEST_TYPE_KAT_KEM "KAT_KEM"
+#define OSSL_SELF_TEST_TYPE_KAT_DIGEST "KAT_Digest"
+#define OSSL_SELF_TEST_TYPE_KAT_SIGNATURE "KAT_Signature"
+#define OSSL_SELF_TEST_TYPE_PCT_SIGNATURE "PCT_Signature"
+#define OSSL_SELF_TEST_TYPE_KAT_KDF "KAT_KDF"
+#define OSSL_SELF_TEST_TYPE_KAT_KA "KAT_KA"
+#define OSSL_SELF_TEST_TYPE_DRBG "DRBG"
 
 /* Test event sub categories */
-# define OSSL_SELF_TEST_DESC_NONE           "None"
-# define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
-# define OSSL_SELF_TEST_DESC_PCT_RSA        "RSA"
-# define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1  "RSA"
-# define OSSL_SELF_TEST_DESC_PCT_ECDSA      "ECDSA"
-# define OSSL_SELF_TEST_DESC_PCT_EDDSA      "EDDSA"
-# define OSSL_SELF_TEST_DESC_PCT_DH         "DH"
-# define OSSL_SELF_TEST_DESC_PCT_DSA        "DSA"
-# define OSSL_SELF_TEST_DESC_PCT_ML_DSA     "ML-DSA"
-# define OSSL_SELF_TEST_DESC_PCT_ML_KEM     "ML-KEM"
-# define OSSL_SELF_TEST_DESC_PCT_SLH_DSA    "SLH-DSA"
-# define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
-# define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
-# define OSSL_SELF_TEST_DESC_CIPHER_TDES    "TDES"
-# define OSSL_SELF_TEST_DESC_ASYM_RSA_ENC   "RSA_Encrypt"
-# define OSSL_SELF_TEST_DESC_ASYM_RSA_DEC   "RSA_Decrypt"
-# define OSSL_SELF_TEST_DESC_MD_SHA1        "SHA1"
-# define OSSL_SELF_TEST_DESC_MD_SHA2        "SHA2"
-# define OSSL_SELF_TEST_DESC_MD_SHA3        "SHA3"
-# define OSSL_SELF_TEST_DESC_SIGN_DSA       "DSA"
-# define OSSL_SELF_TEST_DESC_SIGN_RSA       "RSA"
-# define OSSL_SELF_TEST_DESC_SIGN_ECDSA     "ECDSA"
-# define OSSL_SELF_TEST_DESC_SIGN_EDDSA     "EDDSA"
-# define OSSL_SELF_TEST_DESC_SIGN_ML_DSA    "ML-DSA"
-# define OSSL_SELF_TEST_DESC_SIGN_SLH_DSA   "SLH-DSA"
-# define OSSL_SELF_TEST_DESC_KEM            "KEM"
-# define OSSL_SELF_TEST_DESC_DRBG_CTR       "CTR"
-# define OSSL_SELF_TEST_DESC_DRBG_HASH      "HASH"
-# define OSSL_SELF_TEST_DESC_DRBG_HMAC      "HMAC"
-# define OSSL_SELF_TEST_DESC_KA_DH          "DH"
-# define OSSL_SELF_TEST_DESC_KA_ECDH        "ECDH"
-# define OSSL_SELF_TEST_DESC_KDF_HKDF       "HKDF"
-# define OSSL_SELF_TEST_DESC_KDF_SSKDF      "SSKDF"
-# define OSSL_SELF_TEST_DESC_KDF_X963KDF    "X963KDF"
-# define OSSL_SELF_TEST_DESC_KDF_X942KDF    "X942KDF"
-# define OSSL_SELF_TEST_DESC_KDF_PBKDF2     "PBKDF2"
-# define OSSL_SELF_TEST_DESC_KDF_SSHKDF     "SSHKDF"
-# define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF  "TLS12_PRF"
-# define OSSL_SELF_TEST_DESC_KDF_KBKDF      "KBKDF"
-# define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
-# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT  "TLS13_KDF_EXTRACT"
-# define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND   "TLS13_KDF_EXPAND"
-# define OSSL_SELF_TEST_DESC_RNG            "RNG"
-# define OSSL_SELF_TEST_DESC_KEYGEN_ML_DSA  "ML-DSA"
-# define OSSL_SELF_TEST_DESC_KEYGEN_ML_KEM  "ML-KEM"
-# define OSSL_SELF_TEST_DESC_KEYGEN_SLH_DSA "SLH-DSA"
-# define OSSL_SELF_TEST_DESC_ENCAP_KEM      "KEM_Encap"
-# define OSSL_SELF_TEST_DESC_DECAP_KEM      "KEM_Decap"
-# define OSSL_SELF_TEST_DESC_DECAP_KEM_FAIL "KEM_Decap_Reject"
+#define OSSL_SELF_TEST_DESC_NONE "None"
+#define OSSL_SELF_TEST_DESC_INTEGRITY_HMAC "HMAC"
+#define OSSL_SELF_TEST_DESC_PCT_RSA "RSA"
+#define OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1 "RSA"
+#define OSSL_SELF_TEST_DESC_PCT_ECDSA "ECDSA"
+#define OSSL_SELF_TEST_DESC_PCT_EDDSA "EDDSA"
+#define OSSL_SELF_TEST_DESC_PCT_DH "DH"
+#define OSSL_SELF_TEST_DESC_PCT_DSA "DSA"
+#define OSSL_SELF_TEST_DESC_PCT_ML_DSA "ML-DSA"
+#define OSSL_SELF_TEST_DESC_PCT_ML_KEM "ML-KEM"
+#define OSSL_SELF_TEST_DESC_PCT_SLH_DSA "SLH-DSA"
+#define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
+#define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
+#define OSSL_SELF_TEST_DESC_CIPHER_TDES "TDES"
+#define OSSL_SELF_TEST_DESC_ASYM_RSA_ENC "RSA_Encrypt"
+#define OSSL_SELF_TEST_DESC_ASYM_RSA_DEC "RSA_Decrypt"
+#define OSSL_SELF_TEST_DESC_MD_SHA1 "SHA1"
+#define OSSL_SELF_TEST_DESC_MD_SHA2 "SHA2"
+#define OSSL_SELF_TEST_DESC_MD_SHA3 "SHA3"
+#define OSSL_SELF_TEST_DESC_SIGN_DSA "DSA"
+#define OSSL_SELF_TEST_DESC_SIGN_RSA "RSA"
+#define OSSL_SELF_TEST_DESC_SIGN_ECDSA "ECDSA"
+#define OSSL_SELF_TEST_DESC_SIGN_EDDSA "EDDSA"
+#define OSSL_SELF_TEST_DESC_SIGN_ML_DSA "ML-DSA"
+#define OSSL_SELF_TEST_DESC_SIGN_SLH_DSA "SLH-DSA"
+#define OSSL_SELF_TEST_DESC_KEM "KEM"
+#define OSSL_SELF_TEST_DESC_DRBG_CTR "CTR"
+#define OSSL_SELF_TEST_DESC_DRBG_HASH "HASH"
+#define OSSL_SELF_TEST_DESC_DRBG_HMAC "HMAC"
+#define OSSL_SELF_TEST_DESC_KA_DH "DH"
+#define OSSL_SELF_TEST_DESC_KA_ECDH "ECDH"
+#define OSSL_SELF_TEST_DESC_KDF_HKDF "HKDF"
+#define OSSL_SELF_TEST_DESC_KDF_SSKDF "SSKDF"
+#define OSSL_SELF_TEST_DESC_KDF_X963KDF "X963KDF"
+#define OSSL_SELF_TEST_DESC_KDF_X942KDF "X942KDF"
+#define OSSL_SELF_TEST_DESC_KDF_PBKDF2 "PBKDF2"
+#define OSSL_SELF_TEST_DESC_KDF_SSHKDF "SSHKDF"
+#define OSSL_SELF_TEST_DESC_KDF_TLS12_PRF "TLS12_PRF"
+#define OSSL_SELF_TEST_DESC_KDF_KBKDF "KBKDF"
+#define OSSL_SELF_TEST_DESC_KDF_KBKDF_KMAC "KBKDF_KMAC"
+#define OSSL_SELF_TEST_DESC_KDF_TLS13_EXTRACT "TLS13_KDF_EXTRACT"
+#define OSSL_SELF_TEST_DESC_KDF_TLS13_EXPAND "TLS13_KDF_EXPAND"
+#define OSSL_SELF_TEST_DESC_RNG "RNG"
+#define OSSL_SELF_TEST_DESC_KEYGEN_ML_DSA "ML-DSA"
+#define OSSL_SELF_TEST_DESC_KEYGEN_ML_KEM "ML-KEM"
+#define OSSL_SELF_TEST_DESC_KEYGEN_SLH_DSA "SLH-DSA"
+#define OSSL_SELF_TEST_DESC_ENCAP_KEM "KEM_Encap"
+#define OSSL_SELF_TEST_DESC_DECAP_KEM "KEM_Decap"
+#define OSSL_SELF_TEST_DESC_DECAP_KEM_FAIL "KEM_Decap_Reject"
 
 void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
-                                 void *cbarg);
+    void *cbarg);
 void OSSL_SELF_TEST_get_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK **cb,
-                                 void **cbarg);
+    void **cbarg);
 
 OSSL_SELF_TEST *OSSL_SELF_TEST_new(OSSL_CALLBACK *cb, void *cbarg);
 void OSSL_SELF_TEST_free(OSSL_SELF_TEST *st);
 
 void OSSL_SELF_TEST_onbegin(OSSL_SELF_TEST *st, const char *type,
-                            const char *desc);
+    const char *desc);
 int OSSL_SELF_TEST_oncorrupt_byte(OSSL_SELF_TEST *st, unsigned char *bytes);
 void OSSL_SELF_TEST_onend(OSSL_SELF_TEST *st, int ret);
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif /* OPENSSL_SELF_TEST_H */
diff --git a/include/openssl/sha.h b/include/openssl/sha.h
index 163a7d588af9..52b02661f624 100644
--- a/include/openssl/sha.h
+++ b/include/openssl/sha.h
@@ -8,36 +8,36 @@
  */
 
 #ifndef OPENSSL_SHA_H
-# define OPENSSL_SHA_H
-# pragma once
+#define OPENSSL_SHA_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SHA_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SHA_H
+#endif
 
-# include <openssl/e_os2.h>
-# include <stddef.h>
+#include <openssl/e_os2.h>
+#include <stddef.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# define SHA_DIGEST_LENGTH 20
+#define SHA_DIGEST_LENGTH 20
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*-
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  * ! SHA_LONG has to be at least 32 bits wide.                    !
  * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  */
-#  define SHA_LONG unsigned int
+#define SHA_LONG unsigned int
 
-#  define SHA_LBLOCK      16
-#  define SHA_CBLOCK      (SHA_LBLOCK*4)/* SHA treats input data as a
-                                         * contiguous array of 32 bit wide
-                                         * big-endian values. */
-#  define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
+#define SHA_LBLOCK 16
+#define SHA_CBLOCK (SHA_LBLOCK * 4) /* SHA treats input data as a      \
+                                     * contiguous array of 32 bit wide \
+                                     * big-endian values. */
+#define SHA_LAST_BLOCK (SHA_CBLOCK - 8)
 
 typedef struct SHAstate_st {
     SHA_LONG h0, h1, h2, h3, h4;
@@ -50,13 +50,13 @@ OSSL_DEPRECATEDIN_3_0 int SHA1_Init(SHA_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int SHA1_Final(unsigned char *md, SHA_CTX *c);
 OSSL_DEPRECATEDIN_3_0 void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-# endif
+#endif
 
 unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SHA256_CBLOCK   (SHA_LBLOCK*4)/* SHA-256 treats input data as a
-                                        * contiguous array of 32 bit wide
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SHA256_CBLOCK (SHA_LBLOCK * 4) /* SHA-256 treats input data as a  \
+                                        * contiguous array of 32 bit wide \
                                         * big-endian values. */
 
 typedef struct SHA256state_st {
@@ -68,26 +68,26 @@ typedef struct SHA256state_st {
 
 OSSL_DEPRECATEDIN_3_0 int SHA224_Init(SHA256_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA224_Update(SHA256_CTX *c,
-                                        const void *data, size_t len);
+    const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int SHA224_Final(unsigned char *md, SHA256_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA256_Init(SHA256_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA256_Update(SHA256_CTX *c,
-                                        const void *data, size_t len);
+    const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int SHA256_Final(unsigned char *md, SHA256_CTX *c);
 OSSL_DEPRECATEDIN_3_0 void SHA256_Transform(SHA256_CTX *c,
-                                            const unsigned char *data);
-# endif
+    const unsigned char *data);
+#endif
 
 unsigned char *SHA224(const unsigned char *d, size_t n, unsigned char *md);
 unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
 
-# define SHA256_192_DIGEST_LENGTH 24
-# define SHA224_DIGEST_LENGTH    28
-# define SHA256_DIGEST_LENGTH    32
-# define SHA384_DIGEST_LENGTH    48
-# define SHA512_DIGEST_LENGTH    64
+#define SHA256_192_DIGEST_LENGTH 24
+#define SHA224_DIGEST_LENGTH 28
+#define SHA256_DIGEST_LENGTH 32
+#define SHA384_DIGEST_LENGTH 48
+#define SHA512_DIGEST_LENGTH 64
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /*
  * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
  * being exactly 64-bit wide. See Implementation Notes in sha512.c
@@ -98,14 +98,14 @@ unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
  * contiguous array of 64 bit
  * wide big-endian values.
  */
-#  define SHA512_CBLOCK   (SHA_LBLOCK*8)
-#  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#   define SHA_LONG64 unsigned __int64
-#  elif defined(__arch64__)
-#   define SHA_LONG64 unsigned long
-#  else
-#   define SHA_LONG64 unsigned long long
-#  endif
+#define SHA512_CBLOCK (SHA_LBLOCK * 8)
+#if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
+#define SHA_LONG64 unsigned __int64
+#elif defined(__arch64__)
+#define SHA_LONG64 unsigned long
+#else
+#define SHA_LONG64 unsigned long long
+#endif
 
 typedef struct SHA512state_st {
     SHA_LONG64 h[8];
@@ -119,21 +119,21 @@ typedef struct SHA512state_st {
 
 OSSL_DEPRECATEDIN_3_0 int SHA384_Init(SHA512_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA384_Update(SHA512_CTX *c,
-                                        const void *data, size_t len);
+    const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int SHA384_Final(unsigned char *md, SHA512_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA512_Init(SHA512_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int SHA512_Update(SHA512_CTX *c,
-                                        const void *data, size_t len);
+    const void *data, size_t len);
 OSSL_DEPRECATEDIN_3_0 int SHA512_Final(unsigned char *md, SHA512_CTX *c);
 OSSL_DEPRECATEDIN_3_0 void SHA512_Transform(SHA512_CTX *c,
-                                            const unsigned char *data);
-# endif
+    const unsigned char *data);
+#endif
 
 unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md);
 unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/srp.h.in b/include/openssl/srp.h.in
index dfbe845b8387..6d2350d2e48e 100644
--- a/include/openssl/srp.h.in
+++ b/include/openssl/srp.h.in
@@ -13,42 +13,45 @@
  * for the EdelKey project.
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_SRP_H
-# define OPENSSL_SRP_H
-# pragma once
+#define OPENSSL_SRP_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SRP_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SRP_H
+#endif
 
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_NO_SRP
-# include <stdio.h>
-# include <string.h>
-# include <openssl/safestack.h>
-# include <openssl/bn.h>
-# include <openssl/crypto.h>
+#include <stdio.h>
+#include <string.h>
+#include <openssl/safestack.h>
+#include <openssl/bn.h>
+#include <openssl/crypto.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
 typedef struct SRP_gN_cache_st {
     char *b64_bn;
     BIGNUM *bn;
 } SRP_gN_cache;
+/* clang-format off */
 {-
     generate_stack_macros("SRP_gN_cache");
 -}
-
+/* clang-format on */
 
 typedef struct SRP_user_pwd_st {
     /* Owned by us. */
@@ -61,9 +64,11 @@ typedef struct SRP_user_pwd_st {
     /* Owned by us. */
     char *info;
 } SRP_user_pwd;
+/* clang-format off */
 {-
     generate_stack_macros("SRP_user_pwd");
 -}
+/* clang-format on */
 
 OSSL_DEPRECATEDIN_3_0
 SRP_user_pwd *SRP_user_pwd_new(void);
@@ -72,17 +77,17 @@ void SRP_user_pwd_free(SRP_user_pwd *user_pwd);
 
 OSSL_DEPRECATEDIN_3_0
 void SRP_user_pwd_set_gN(SRP_user_pwd *user_pwd, const BIGNUM *g,
-                         const BIGNUM *N);
+    const BIGNUM *N);
 OSSL_DEPRECATEDIN_3_0
 int SRP_user_pwd_set1_ids(SRP_user_pwd *user_pwd, const char *id,
-                          const char *info);
+    const char *info);
 OSSL_DEPRECATEDIN_3_0
 int SRP_user_pwd_set0_sv(SRP_user_pwd *user_pwd, BIGNUM *s, BIGNUM *v);
 
 typedef struct SRP_VBASE_st {
     STACK_OF(SRP_user_pwd) *users_pwd;
     STACK_OF(SRP_gN_cache) *gN_cache;
-/* to simulate a user */
+    /* to simulate a user */
     char *seed_key;
     const BIGNUM *default_g;
     const BIGNUM *default_N;
@@ -96,10 +101,11 @@ typedef struct SRP_gN_st {
     const BIGNUM *g;
     const BIGNUM *N;
 } SRP_gN;
+/* clang-format off */
 {-
     generate_stack_macros("SRP_gN");
 -}
-
+/* clang-format on */
 
 OSSL_DEPRECATEDIN_3_0
 SRP_VBASE *SRP_VBASE_new(char *seed_key);
@@ -117,40 +123,40 @@ SRP_user_pwd *SRP_VBASE_get1_by_user(SRP_VBASE *vb, char *username);
 
 OSSL_DEPRECATEDIN_3_0
 char *SRP_create_verifier_ex(const char *user, const char *pass, char **salt,
-                             char **verifier, const char *N, const char *g,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    char **verifier, const char *N, const char *g,
+    OSSL_LIB_CTX *libctx, const char *propq);
 OSSL_DEPRECATEDIN_3_0
 char *SRP_create_verifier(const char *user, const char *pass, char **salt,
-                          char **verifier, const char *N, const char *g);
+    char **verifier, const char *N, const char *g);
 OSSL_DEPRECATEDIN_3_0
 int SRP_create_verifier_BN_ex(const char *user, const char *pass, BIGNUM **salt,
-                              BIGNUM **verifier, const BIGNUM *N,
-                              const BIGNUM *g, OSSL_LIB_CTX *libctx,
-                              const char *propq);
+    BIGNUM **verifier, const BIGNUM *N,
+    const BIGNUM *g, OSSL_LIB_CTX *libctx,
+    const char *propq);
 OSSL_DEPRECATEDIN_3_0
 int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
-                           BIGNUM **verifier, const BIGNUM *N,
-                           const BIGNUM *g);
+    BIGNUM **verifier, const BIGNUM *N,
+    const BIGNUM *g);
 
-#  define SRP_NO_ERROR 0
-#  define SRP_ERR_VBASE_INCOMPLETE_FILE 1
-#  define SRP_ERR_VBASE_BN_LIB 2
-#  define SRP_ERR_OPEN_FILE 3
-#  define SRP_ERR_MEMORY 4
+#define SRP_NO_ERROR 0
+#define SRP_ERR_VBASE_INCOMPLETE_FILE 1
+#define SRP_ERR_VBASE_BN_LIB 2
+#define SRP_ERR_OPEN_FILE 3
+#define SRP_ERR_MEMORY 4
 
-#  define DB_srptype      0
-#  define DB_srpverifier  1
-#  define DB_srpsalt      2
-#  define DB_srpid        3
-#  define DB_srpgN        4
-#  define DB_srpinfo      5
-#  undef  DB_NUMBER
-#  define DB_NUMBER       6
+#define DB_srptype 0
+#define DB_srpverifier 1
+#define DB_srpsalt 2
+#define DB_srpid 3
+#define DB_srpgN 4
+#define DB_srpinfo 5
+#undef DB_NUMBER
+#define DB_NUMBER 6
 
-#  define DB_SRP_INDEX    'I'
-#  define DB_SRP_VALID    'V'
-#  define DB_SRP_REVOKED  'R'
-#  define DB_SRP_MODIF    'v'
+#define DB_SRP_INDEX 'I'
+#define DB_SRP_VALID 'V'
+#define DB_SRP_REVOKED 'R'
+#define DB_SRP_MODIF 'v'
 
 /* see srp.c */
 OSSL_DEPRECATEDIN_3_0
@@ -161,19 +167,19 @@ SRP_gN *SRP_get_default_gN(const char *id);
 /* server side .... */
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_server_key(const BIGNUM *A, const BIGNUM *v, const BIGNUM *u,
-                            const BIGNUM *b, const BIGNUM *N);
+    const BIGNUM *b, const BIGNUM *N);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_B_ex(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
-                      const BIGNUM *v, OSSL_LIB_CTX *libctx, const char *propq);
+    const BIGNUM *v, OSSL_LIB_CTX *libctx, const char *propq);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_B(const BIGNUM *b, const BIGNUM *N, const BIGNUM *g,
-                   const BIGNUM *v);
+    const BIGNUM *v);
 
 OSSL_DEPRECATEDIN_3_0
 int SRP_Verify_A_mod_N(const BIGNUM *A, const BIGNUM *N);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_u_ex(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N,
-                      OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_u(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N);
 
@@ -181,34 +187,34 @@ BIGNUM *SRP_Calc_u(const BIGNUM *A, const BIGNUM *B, const BIGNUM *N);
 
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_x_ex(const BIGNUM *s, const char *user, const char *pass,
-                      OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_x(const BIGNUM *s, const char *user, const char *pass);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_A(const BIGNUM *a, const BIGNUM *N, const BIGNUM *g);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_client_key_ex(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g,
-                            const BIGNUM *x, const BIGNUM *a, const BIGNUM *u,
-                            OSSL_LIB_CTX *libctx, const char *propq);
+    const BIGNUM *x, const BIGNUM *a, const BIGNUM *u,
+    OSSL_LIB_CTX *libctx, const char *propq);
 OSSL_DEPRECATEDIN_3_0
 BIGNUM *SRP_Calc_client_key(const BIGNUM *N, const BIGNUM *B, const BIGNUM *g,
-                            const BIGNUM *x, const BIGNUM *a, const BIGNUM *u);
+    const BIGNUM *x, const BIGNUM *a, const BIGNUM *u);
 OSSL_DEPRECATEDIN_3_0
 int SRP_Verify_B_mod_N(const BIGNUM *B, const BIGNUM *N);
 
-#  define SRP_MINIMAL_N 1024
+#define SRP_MINIMAL_N 1024
 
-# endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 /* This method ignores the configured seed and fails for an unknown user. */
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0
 SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username);
-# endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h
index 2c2c334443c4..3b716e124b38 100644
--- a/include/openssl/srtp.h
+++ b/include/openssl/srtp.h
@@ -14,44 +14,44 @@
  */
 
 #ifndef OPENSSL_SRTP_H
-# define OPENSSL_SRTP_H
-# pragma once
+#define OPENSSL_SRTP_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_D1_SRTP_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_D1_SRTP_H
+#endif
 
-# include <openssl/ssl.h>
+#include <openssl/ssl.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define SRTP_AES128_CM_SHA1_80                     0x0001
-# define SRTP_AES128_CM_SHA1_32                     0x0002
-# define SRTP_AES128_F8_SHA1_80                     0x0003
-# define SRTP_AES128_F8_SHA1_32                     0x0004
-# define SRTP_NULL_SHA1_80                          0x0005
-# define SRTP_NULL_SHA1_32                          0x0006
+#define SRTP_AES128_CM_SHA1_80 0x0001
+#define SRTP_AES128_CM_SHA1_32 0x0002
+#define SRTP_AES128_F8_SHA1_80 0x0003
+#define SRTP_AES128_F8_SHA1_32 0x0004
+#define SRTP_NULL_SHA1_80 0x0005
+#define SRTP_NULL_SHA1_32 0x0006
 
 /* AEAD SRTP protection profiles from RFC 7714 */
-# define SRTP_AEAD_AES_128_GCM                      0x0007
-# define SRTP_AEAD_AES_256_GCM                      0x0008
+#define SRTP_AEAD_AES_128_GCM 0x0007
+#define SRTP_AEAD_AES_256_GCM 0x0008
 
 /* DOUBLE AEAD SRTP protection profiles from RFC 8723 */
-# define SRTP_DOUBLE_AEAD_AES_128_GCM_AEAD_AES_128_GCM   0x0009
-# define SRTP_DOUBLE_AEAD_AES_256_GCM_AEAD_AES_256_GCM   0x000A
+#define SRTP_DOUBLE_AEAD_AES_128_GCM_AEAD_AES_128_GCM 0x0009
+#define SRTP_DOUBLE_AEAD_AES_256_GCM_AEAD_AES_256_GCM 0x000A
 
 /* ARIA SRTP protection profiles from RFC 8269 */
-# define SRTP_ARIA_128_CTR_HMAC_SHA1_80             0x000B
-# define SRTP_ARIA_128_CTR_HMAC_SHA1_32             0x000C
-# define SRTP_ARIA_256_CTR_HMAC_SHA1_80             0x000D
-# define SRTP_ARIA_256_CTR_HMAC_SHA1_32             0x000E
-# define SRTP_AEAD_ARIA_128_GCM                     0x000F
-# define SRTP_AEAD_ARIA_256_GCM                     0x0010
+#define SRTP_ARIA_128_CTR_HMAC_SHA1_80 0x000B
+#define SRTP_ARIA_128_CTR_HMAC_SHA1_32 0x000C
+#define SRTP_ARIA_256_CTR_HMAC_SHA1_80 0x000D
+#define SRTP_ARIA_256_CTR_HMAC_SHA1_32 0x000E
+#define SRTP_AEAD_ARIA_128_GCM 0x000F
+#define SRTP_AEAD_ARIA_256_GCM 0x0010
 
-# ifndef OPENSSL_NO_SRTP
+#ifndef OPENSSL_NO_SRTP
 
 __owur int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
 __owur int SSL_set_tlsext_use_srtp(SSL *ssl, const char *profiles);
@@ -59,9 +59,9 @@ __owur int SSL_set_tlsext_use_srtp(SSL *ssl, const char *profiles);
 __owur STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
 __owur SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
 
-# endif
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index 383c5bc411f1..bdcc68529be5 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -11,44 +11,46 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros generate_const_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_SSL_H
-# define OPENSSL_SSL_H
-# pragma once
+#define OPENSSL_SSL_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SSL_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SSL_H
+#endif
 
-# include <openssl/e_os2.h>
-# include <openssl/e_ostime.h>
-# include <openssl/opensslconf.h>
-# include <openssl/comp.h>
-# include <openssl/bio.h>
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  include <openssl/x509.h>
-#  include <openssl/crypto.h>
-#  include <openssl/buffer.h>
-# endif
-# include <openssl/lhash.h>
-# include <openssl/pem.h>
-# include <openssl/hmac.h>
-# include <openssl/async.h>
+#include <openssl/e_os2.h>
+#include <openssl/e_ostime.h>
+#include <openssl/opensslconf.h>
+#include <openssl/comp.h>
+#include <openssl/bio.h>
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/x509.h>
+#include <openssl/crypto.h>
+#include <openssl/buffer.h>
+#endif
+#include <openssl/lhash.h>
+#include <openssl/pem.h>
+#include <openssl/hmac.h>
+#include <openssl/async.h>
 
-# include <openssl/safestack.h>
-# include <openssl/symhacks.h>
-# include <openssl/ct.h>
-# include <openssl/sslerr.h>
-# include <openssl/prov_ssl.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/safestack.h>
+#include <openssl/symhacks.h>
+#include <openssl/ct.h>
+#include <openssl/sslerr.h>
+#include <openssl/prov_ssl.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -57,116 +59,116 @@ extern "C" {
  * Version 0 - initial version
  * Version 1 - added the optional peer certificate
  */
-# define SSL_SESSION_ASN1_VERSION 0x0001
+#define SSL_SESSION_ASN1_VERSION 0x0001
 
-# define SSL_MAX_SSL_SESSION_ID_LENGTH           32
-# define SSL_MAX_SID_CTX_LENGTH                  32
+#define SSL_MAX_SSL_SESSION_ID_LENGTH 32
+#define SSL_MAX_SID_CTX_LENGTH 32
 
-# define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES     (512/8)
-# define SSL_MAX_KEY_ARG_LENGTH                  8
+#define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES (512 / 8)
+#define SSL_MAX_KEY_ARG_LENGTH 8
 /* SSL_MAX_MASTER_KEY_LENGTH is defined in prov_ssl.h */
 
 /* The maximum number of encrypt/decrypt pipelines we can support */
-# define SSL_MAX_PIPELINES  32
+#define SSL_MAX_PIPELINES 32
 
 /* text strings for the ciphers */
 
 /* These are used to specify which ciphers to use and not to use */
 
-# define SSL_TXT_LOW             "LOW"
-# define SSL_TXT_MEDIUM          "MEDIUM"
-# define SSL_TXT_HIGH            "HIGH"
-# define SSL_TXT_FIPS            "FIPS"
+#define SSL_TXT_LOW "LOW"
+#define SSL_TXT_MEDIUM "MEDIUM"
+#define SSL_TXT_HIGH "HIGH"
+#define SSL_TXT_FIPS "FIPS"
 
-# define SSL_TXT_aNULL           "aNULL"
-# define SSL_TXT_eNULL           "eNULL"
-# define SSL_TXT_NULL            "NULL"
+#define SSL_TXT_aNULL "aNULL"
+#define SSL_TXT_eNULL "eNULL"
+#define SSL_TXT_NULL "NULL"
 
-# define SSL_TXT_kRSA            "kRSA"
-# define SSL_TXT_kDHr            "kDHr"/* this cipher class has been removed */
-# define SSL_TXT_kDHd            "kDHd"/* this cipher class has been removed */
-# define SSL_TXT_kDH             "kDH"/* this cipher class has been removed */
-# define SSL_TXT_kEDH            "kEDH"/* alias for kDHE */
-# define SSL_TXT_kDHE            "kDHE"
-# define SSL_TXT_kECDHr          "kECDHr"/* this cipher class has been removed */
-# define SSL_TXT_kECDHe          "kECDHe"/* this cipher class has been removed */
-# define SSL_TXT_kECDH           "kECDH"/* this cipher class has been removed */
-# define SSL_TXT_kEECDH          "kEECDH"/* alias for kECDHE */
-# define SSL_TXT_kECDHE          "kECDHE"
-# define SSL_TXT_kPSK            "kPSK"
-# define SSL_TXT_kRSAPSK         "kRSAPSK"
-# define SSL_TXT_kECDHEPSK       "kECDHEPSK"
-# define SSL_TXT_kDHEPSK         "kDHEPSK"
-# define SSL_TXT_kGOST           "kGOST"
-# define SSL_TXT_kGOST18         "kGOST18"
-# define SSL_TXT_kSRP            "kSRP"
+#define SSL_TXT_kRSA "kRSA"
+#define SSL_TXT_kDHr "kDHr" /* this cipher class has been removed */
+#define SSL_TXT_kDHd "kDHd" /* this cipher class has been removed */
+#define SSL_TXT_kDH "kDH" /* this cipher class has been removed */
+#define SSL_TXT_kEDH "kEDH" /* alias for kDHE */
+#define SSL_TXT_kDHE "kDHE"
+#define SSL_TXT_kECDHr "kECDHr" /* this cipher class has been removed */
+#define SSL_TXT_kECDHe "kECDHe" /* this cipher class has been removed */
+#define SSL_TXT_kECDH "kECDH" /* this cipher class has been removed */
+#define SSL_TXT_kEECDH "kEECDH" /* alias for kECDHE */
+#define SSL_TXT_kECDHE "kECDHE"
+#define SSL_TXT_kPSK "kPSK"
+#define SSL_TXT_kRSAPSK "kRSAPSK"
+#define SSL_TXT_kECDHEPSK "kECDHEPSK"
+#define SSL_TXT_kDHEPSK "kDHEPSK"
+#define SSL_TXT_kGOST "kGOST"
+#define SSL_TXT_kGOST18 "kGOST18"
+#define SSL_TXT_kSRP "kSRP"
 
-# define SSL_TXT_aRSA            "aRSA"
-# define SSL_TXT_aDSS            "aDSS"
-# define SSL_TXT_aDH             "aDH"/* this cipher class has been removed */
-# define SSL_TXT_aECDH           "aECDH"/* this cipher class has been removed */
-# define SSL_TXT_aECDSA          "aECDSA"
-# define SSL_TXT_aPSK            "aPSK"
-# define SSL_TXT_aGOST94         "aGOST94"
-# define SSL_TXT_aGOST01         "aGOST01"
-# define SSL_TXT_aGOST12         "aGOST12"
-# define SSL_TXT_aGOST           "aGOST"
-# define SSL_TXT_aSRP            "aSRP"
+#define SSL_TXT_aRSA "aRSA"
+#define SSL_TXT_aDSS "aDSS"
+#define SSL_TXT_aDH "aDH" /* this cipher class has been removed */
+#define SSL_TXT_aECDH "aECDH" /* this cipher class has been removed */
+#define SSL_TXT_aECDSA "aECDSA"
+#define SSL_TXT_aPSK "aPSK"
+#define SSL_TXT_aGOST94 "aGOST94"
+#define SSL_TXT_aGOST01 "aGOST01"
+#define SSL_TXT_aGOST12 "aGOST12"
+#define SSL_TXT_aGOST "aGOST"
+#define SSL_TXT_aSRP "aSRP"
 
-# define SSL_TXT_DSS             "DSS"
-# define SSL_TXT_DH              "DH"
-# define SSL_TXT_DHE             "DHE"/* same as "kDHE:-ADH" */
-# define SSL_TXT_EDH             "EDH"/* alias for DHE */
-# define SSL_TXT_ADH             "ADH"
-# define SSL_TXT_RSA             "RSA"
-# define SSL_TXT_ECDH            "ECDH"
-# define SSL_TXT_EECDH           "EECDH"/* alias for ECDHE" */
-# define SSL_TXT_ECDHE           "ECDHE"/* same as "kECDHE:-AECDH" */
-# define SSL_TXT_AECDH           "AECDH"
-# define SSL_TXT_ECDSA           "ECDSA"
-# define SSL_TXT_PSK             "PSK"
-# define SSL_TXT_SRP             "SRP"
+#define SSL_TXT_DSS "DSS"
+#define SSL_TXT_DH "DH"
+#define SSL_TXT_DHE "DHE" /* same as "kDHE:-ADH" */
+#define SSL_TXT_EDH "EDH" /* alias for DHE */
+#define SSL_TXT_ADH "ADH"
+#define SSL_TXT_RSA "RSA"
+#define SSL_TXT_ECDH "ECDH"
+#define SSL_TXT_EECDH "EECDH" /* alias for ECDHE" */
+#define SSL_TXT_ECDHE "ECDHE" /* same as "kECDHE:-AECDH" */
+#define SSL_TXT_AECDH "AECDH"
+#define SSL_TXT_ECDSA "ECDSA"
+#define SSL_TXT_PSK "PSK"
+#define SSL_TXT_SRP "SRP"
 
-# define SSL_TXT_DES             "DES"
-# define SSL_TXT_3DES            "3DES"
-# define SSL_TXT_RC4             "RC4"
-# define SSL_TXT_RC2             "RC2"
-# define SSL_TXT_IDEA            "IDEA"
-# define SSL_TXT_SEED            "SEED"
-# define SSL_TXT_AES128          "AES128"
-# define SSL_TXT_AES256          "AES256"
-# define SSL_TXT_AES             "AES"
-# define SSL_TXT_AES_GCM         "AESGCM"
-# define SSL_TXT_AES_CCM         "AESCCM"
-# define SSL_TXT_AES_CCM_8       "AESCCM8"
-# define SSL_TXT_CAMELLIA128     "CAMELLIA128"
-# define SSL_TXT_CAMELLIA256     "CAMELLIA256"
-# define SSL_TXT_CAMELLIA        "CAMELLIA"
-# define SSL_TXT_CHACHA20        "CHACHA20"
-# define SSL_TXT_GOST            "GOST89"
-# define SSL_TXT_ARIA            "ARIA"
-# define SSL_TXT_ARIA_GCM        "ARIAGCM"
-# define SSL_TXT_ARIA128         "ARIA128"
-# define SSL_TXT_ARIA256         "ARIA256"
-# define SSL_TXT_GOST2012_GOST8912_GOST8912 "GOST2012-GOST8912-GOST8912"
-# define SSL_TXT_CBC             "CBC"
+#define SSL_TXT_DES "DES"
+#define SSL_TXT_3DES "3DES"
+#define SSL_TXT_RC4 "RC4"
+#define SSL_TXT_RC2 "RC2"
+#define SSL_TXT_IDEA "IDEA"
+#define SSL_TXT_SEED "SEED"
+#define SSL_TXT_AES128 "AES128"
+#define SSL_TXT_AES256 "AES256"
+#define SSL_TXT_AES "AES"
+#define SSL_TXT_AES_GCM "AESGCM"
+#define SSL_TXT_AES_CCM "AESCCM"
+#define SSL_TXT_AES_CCM_8 "AESCCM8"
+#define SSL_TXT_CAMELLIA128 "CAMELLIA128"
+#define SSL_TXT_CAMELLIA256 "CAMELLIA256"
+#define SSL_TXT_CAMELLIA "CAMELLIA"
+#define SSL_TXT_CHACHA20 "CHACHA20"
+#define SSL_TXT_GOST "GOST89"
+#define SSL_TXT_ARIA "ARIA"
+#define SSL_TXT_ARIA_GCM "ARIAGCM"
+#define SSL_TXT_ARIA128 "ARIA128"
+#define SSL_TXT_ARIA256 "ARIA256"
+#define SSL_TXT_GOST2012_GOST8912_GOST8912 "GOST2012-GOST8912-GOST8912"
+#define SSL_TXT_CBC "CBC"
 
-# define SSL_TXT_MD5             "MD5"
-# define SSL_TXT_SHA1            "SHA1"
-# define SSL_TXT_SHA             "SHA"/* same as "SHA1" */
-# define SSL_TXT_GOST94          "GOST94"
-# define SSL_TXT_GOST89MAC       "GOST89MAC"
-# define SSL_TXT_GOST12          "GOST12"
-# define SSL_TXT_GOST89MAC12     "GOST89MAC12"
-# define SSL_TXT_SHA256          "SHA256"
-# define SSL_TXT_SHA384          "SHA384"
+#define SSL_TXT_MD5 "MD5"
+#define SSL_TXT_SHA1 "SHA1"
+#define SSL_TXT_SHA "SHA" /* same as "SHA1" */
+#define SSL_TXT_GOST94 "GOST94"
+#define SSL_TXT_GOST89MAC "GOST89MAC"
+#define SSL_TXT_GOST12 "GOST12"
+#define SSL_TXT_GOST89MAC12 "GOST89MAC12"
+#define SSL_TXT_SHA256 "SHA256"
+#define SSL_TXT_SHA384 "SHA384"
 
-# define SSL_TXT_SSLV3           "SSLv3"
-# define SSL_TXT_TLSV1           "TLSv1"
-# define SSL_TXT_TLSV1_1         "TLSv1.1"
-# define SSL_TXT_TLSV1_2         "TLSv1.2"
+#define SSL_TXT_SSLV3 "SSLv3"
+#define SSL_TXT_TLSV1 "TLSv1"
+#define SSL_TXT_TLSV1_1 "TLSv1.1"
+#define SSL_TXT_TLSV1_2 "TLSv1.2"
 
-# define SSL_TXT_ALL             "ALL"
+#define SSL_TXT_ALL "ALL"
 
 /*-
  * COMPLEMENTOF* definitions. These identifiers are used to (de-select)
@@ -182,8 +184,8 @@ extern "C" {
  * DEFAULT gets, as only selection is being done and no sorting as needed
  * for DEFAULT.
  */
-# define SSL_TXT_CMPALL          "COMPLEMENTOFALL"
-# define SSL_TXT_CMPDEF          "COMPLEMENTOFDEFAULT"
+#define SSL_TXT_CMPALL "COMPLEMENTOFALL"
+#define SSL_TXT_CMPDEF "COMPLEMENTOFDEFAULT"
 
 /*
  * The following cipher list is used by default. It also is substituted when
@@ -192,17 +194,17 @@ extern "C" {
  * DEPRECATED IN 3.0.0, in favor of OSSL_default_cipher_list()
  * Update both macro and function simultaneously
  */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL"
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_DEFAULT_CIPHER_LIST "ALL:!COMPLEMENTOFDEFAULT:!eNULL"
 /*
  * This is the default set of TLSv1.3 ciphersuites
  * DEPRECATED IN 3.0.0, in favor of OSSL_default_ciphersuites()
  * Update both macro and function simultaneously
  */
-#  define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:" \
-                                   "TLS_CHACHA20_POLY1305_SHA256:" \
-                                   "TLS_AES_128_GCM_SHA256"
-# endif
+#define TLS_DEFAULT_CIPHERSUITES "TLS_AES_256_GCM_SHA384:"       \
+                                 "TLS_CHACHA20_POLY1305_SHA256:" \
+                                 "TLS_AES_128_GCM_SHA256"
+#endif
 /*
  * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
  * starts with a reasonable order, and all we have to do for DEFAULT is
@@ -211,19 +213,19 @@ extern "C" {
  */
 
 /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-# define SSL_SENT_SHUTDOWN       1
-# define SSL_RECEIVED_SHUTDOWN   2
+#define SSL_SENT_SHUTDOWN 1
+#define SSL_RECEIVED_SHUTDOWN 2
 
 #ifdef __cplusplus
 }
 #endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define SSL_FILETYPE_ASN1       X509_FILETYPE_ASN1
-# define SSL_FILETYPE_PEM        X509_FILETYPE_PEM
+#define SSL_FILETYPE_ASN1 X509_FILETYPE_ASN1
+#define SSL_FILETYPE_PEM X509_FILETYPE_PEM
 
 /*
  * This is needed to stop compilers complaining about the 'struct ssl_st *'
@@ -244,77 +246,77 @@ typedef struct srtp_protection_profile_st {
     const char *name;
     unsigned long id;
 } SRTP_PROTECTION_PROFILE;
+/* clang-format off */
 {-
     generate_stack_macros("SRTP_PROTECTION_PROFILE");
 -}
-
+/* clang-format on */
 
 typedef int (*tls_session_ticket_ext_cb_fn)(SSL *s, const unsigned char *data,
-                                            int len, void *arg);
+    int len, void *arg);
 typedef int (*tls_session_secret_cb_fn)(SSL *s, void *secret, int *secret_len,
-                                        STACK_OF(SSL_CIPHER) *peer_ciphers,
-                                        const SSL_CIPHER **cipher, void *arg);
+    STACK_OF(SSL_CIPHER) *peer_ciphers,
+    const SSL_CIPHER **cipher, void *arg);
 
 /* Extension context codes */
 /* This extension is only allowed in TLS */
-#define SSL_EXT_TLS_ONLY                        0x00001
+#define SSL_EXT_TLS_ONLY 0x00001
 /* This extension is only allowed in DTLS */
-#define SSL_EXT_DTLS_ONLY                       0x00002
+#define SSL_EXT_DTLS_ONLY 0x00002
 /* Some extensions may be allowed in DTLS but we don't implement them for it */
-#define SSL_EXT_TLS_IMPLEMENTATION_ONLY         0x00004
+#define SSL_EXT_TLS_IMPLEMENTATION_ONLY 0x00004
 /* Most extensions are not defined for SSLv3 but EXT_TYPE_renegotiate is */
-#define SSL_EXT_SSL3_ALLOWED                    0x00008
+#define SSL_EXT_SSL3_ALLOWED 0x00008
 /* Extension is only defined for TLS1.2 and below */
-#define SSL_EXT_TLS1_2_AND_BELOW_ONLY           0x00010
+#define SSL_EXT_TLS1_2_AND_BELOW_ONLY 0x00010
 /* Extension is only defined for TLS1.3 and above */
-#define SSL_EXT_TLS1_3_ONLY                     0x00020
+#define SSL_EXT_TLS1_3_ONLY 0x00020
 /* Ignore this extension during parsing if we are resuming */
-#define SSL_EXT_IGNORE_ON_RESUMPTION            0x00040
-#define SSL_EXT_CLIENT_HELLO                    0x00080
+#define SSL_EXT_IGNORE_ON_RESUMPTION 0x00040
+#define SSL_EXT_CLIENT_HELLO 0x00080
 /* Really means TLS1.2 or below */
-#define SSL_EXT_TLS1_2_SERVER_HELLO             0x00100
-#define SSL_EXT_TLS1_3_SERVER_HELLO             0x00200
-#define SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS     0x00400
-#define SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST      0x00800
-#define SSL_EXT_TLS1_3_CERTIFICATE              0x01000
-#define SSL_EXT_TLS1_3_NEW_SESSION_TICKET       0x02000
-#define SSL_EXT_TLS1_3_CERTIFICATE_REQUEST      0x04000
-#define SSL_EXT_TLS1_3_CERTIFICATE_COMPRESSION  0x08000
+#define SSL_EXT_TLS1_2_SERVER_HELLO 0x00100
+#define SSL_EXT_TLS1_3_SERVER_HELLO 0x00200
+#define SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS 0x00400
+#define SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST 0x00800
+#define SSL_EXT_TLS1_3_CERTIFICATE 0x01000
+#define SSL_EXT_TLS1_3_NEW_SESSION_TICKET 0x02000
+#define SSL_EXT_TLS1_3_CERTIFICATE_REQUEST 0x04000
+#define SSL_EXT_TLS1_3_CERTIFICATE_COMPRESSION 0x08000
 /* When sending a raw public key in a certificate message */
-#define SSL_EXT_TLS1_3_RAW_PUBLIC_KEY           0x10000
+#define SSL_EXT_TLS1_3_RAW_PUBLIC_KEY 0x10000
 
 /* Typedefs for handling custom extensions */
 
 typedef int (*custom_ext_add_cb)(SSL *s, unsigned int ext_type,
-                                 const unsigned char **out, size_t *outlen,
-                                 int *al, void *add_arg);
+    const unsigned char **out, size_t *outlen,
+    int *al, void *add_arg);
 
 typedef void (*custom_ext_free_cb)(SSL *s, unsigned int ext_type,
-                                   const unsigned char *out, void *add_arg);
+    const unsigned char *out, void *add_arg);
 
 typedef int (*custom_ext_parse_cb)(SSL *s, unsigned int ext_type,
-                                   const unsigned char *in, size_t inlen,
-                                   int *al, void *parse_arg);
-
+    const unsigned char *in, size_t inlen,
+    int *al, void *parse_arg);
 
 typedef int (*SSL_custom_ext_add_cb_ex)(SSL *s, unsigned int ext_type,
-                                        unsigned int context,
-                                        const unsigned char **out,
-                                        size_t *outlen, X509 *x,
-                                        size_t chainidx,
-                                        int *al, void *add_arg);
+    unsigned int context,
+    const unsigned char **out,
+    size_t *outlen, X509 *x,
+    size_t chainidx,
+    int *al, void *add_arg);
 
 typedef void (*SSL_custom_ext_free_cb_ex)(SSL *s, unsigned int ext_type,
-                                          unsigned int context,
-                                          const unsigned char *out,
-                                          void *add_arg);
+    unsigned int context,
+    const unsigned char *out,
+    void *add_arg);
 
 typedef int (*SSL_custom_ext_parse_cb_ex)(SSL *s, unsigned int ext_type,
-                                          unsigned int context,
-                                          const unsigned char *in,
-                                          size_t inlen, X509 *x,
-                                          size_t chainidx,
-                                          int *al, void *parse_arg);
+    unsigned int context,
+    const unsigned char *in,
+    size_t inlen, X509 *x,
+    size_t chainidx,
+    int *al, void *parse_arg);
 
 /* Typedef for verification callback */
 typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
@@ -322,96 +324,96 @@ typedef int (*SSL_verify_cb)(int preverify_ok, X509_STORE_CTX *x509_ctx);
 /* Typedef for SSL async callback */
 typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
 
-#define SSL_OP_BIT(n)  ((uint64_t)1 << (uint64_t)n)
+#define SSL_OP_BIT(n) ((uint64_t)1 << (uint64_t)n)
 
 /*
  * SSL/TLS connection options.
  */
-    /* Disable Extended master secret */
-# define SSL_OP_NO_EXTENDED_MASTER_SECRET                SSL_OP_BIT(0)
-    /* Cleanse plaintext copies of data delivered to the application */
-# define SSL_OP_CLEANSE_PLAINTEXT                        SSL_OP_BIT(1)
-    /* Allow initial connection to servers that don't support RI */
-# define SSL_OP_LEGACY_SERVER_CONNECT                    SSL_OP_BIT(2)
-    /* Enable support for Kernel TLS */
-# define SSL_OP_ENABLE_KTLS                              SSL_OP_BIT(3)
-# define SSL_OP_TLSEXT_PADDING                           SSL_OP_BIT(4)
-# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG                   SSL_OP_BIT(6)
-# define SSL_OP_IGNORE_UNEXPECTED_EOF                    SSL_OP_BIT(7)
-# define SSL_OP_ALLOW_CLIENT_RENEGOTIATION               SSL_OP_BIT(8)
-# define SSL_OP_DISABLE_TLSEXT_CA_NAMES                  SSL_OP_BIT(9)
-    /* In TLSv1.3 allow a non-(ec)dhe based kex_mode */
-# define SSL_OP_ALLOW_NO_DHE_KEX                         SSL_OP_BIT(10)
-    /*
-     * Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
-     * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)
-     * the workaround is not needed.  Unfortunately some broken SSL/TLS
-     * implementations cannot handle it at all, which is why we include it
-     * in SSL_OP_ALL. Added in 0.9.6e
-     */
-# define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS              SSL_OP_BIT(11)
-    /* DTLS options */
-# define SSL_OP_NO_QUERY_MTU                             SSL_OP_BIT(12)
-    /* Turn on Cookie Exchange (on relevant for servers) */
-# define SSL_OP_COOKIE_EXCHANGE                          SSL_OP_BIT(13)
-    /* Don't use RFC4507 ticket extension */
-# define SSL_OP_NO_TICKET                                SSL_OP_BIT(14)
-# ifndef OPENSSL_NO_DTLS1_METHOD
-    /*
-     * Use Cisco's version identifier of DTLS_BAD_VER
-     * (only with deprecated DTLSv1_client_method())
-     */
-#  define SSL_OP_CISCO_ANYCONNECT                        SSL_OP_BIT(15)
-# endif
-    /* As server, disallow session resumption on renegotiation */
-# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION   SSL_OP_BIT(16)
-    /* Don't use compression even if supported */
-# define SSL_OP_NO_COMPRESSION                           SSL_OP_BIT(17)
-    /* Permit unsafe legacy renegotiation */
-# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION        SSL_OP_BIT(18)
-    /* Disable encrypt-then-mac */
-# define SSL_OP_NO_ENCRYPT_THEN_MAC                      SSL_OP_BIT(19)
-    /*
-     * Enable TLSv1.3 Compatibility mode. This is on by default. A future
-     * version of OpenSSL may have this disabled by default.
-     */
-# define SSL_OP_ENABLE_MIDDLEBOX_COMPAT                  SSL_OP_BIT(20)
-    /*
-     * Prioritize Chacha20Poly1305 when client does.
-     * Modifies SSL_OP_CIPHER_SERVER_PREFERENCE
-     */
-# define SSL_OP_PRIORITIZE_CHACHA                        SSL_OP_BIT(21)
-    /*
-     * Set on servers to choose the cipher according to server's preferences.
-     */
-# define SSL_OP_CIPHER_SERVER_PREFERENCE                 SSL_OP_BIT(22)
-    /*
-     * If set, a server will allow a client to issue an SSLv3.0 version
-     * number as latest version supported in the premaster secret, even when
-     * TLSv1.0 (version 3.1) was announced in the client hello. Normally
-     * this is forbidden to prevent version rollback attacks.
-     */
-# define SSL_OP_TLS_ROLLBACK_BUG                         SSL_OP_BIT(23)
-    /*
-     * Switches off automatic TLSv1.3 anti-replay protection for early data.
-     * This is a server-side option only (no effect on the client).
-     */
-# define SSL_OP_NO_ANTI_REPLAY                           SSL_OP_BIT(24)
-# define SSL_OP_NO_SSLv3                                 SSL_OP_BIT(25)
-# define SSL_OP_NO_TLSv1                                 SSL_OP_BIT(26)
-# define SSL_OP_NO_TLSv1_2                               SSL_OP_BIT(27)
-# define SSL_OP_NO_TLSv1_1                               SSL_OP_BIT(28)
-# define SSL_OP_NO_TLSv1_3                               SSL_OP_BIT(29)
-# define SSL_OP_NO_DTLSv1                                SSL_OP_BIT(26)
-# define SSL_OP_NO_DTLSv1_2                              SSL_OP_BIT(27)
-    /* Disallow all renegotiation */
-# define SSL_OP_NO_RENEGOTIATION                         SSL_OP_BIT(30)
-    /*
-     * Make server add server-hello extension from early version of
-     * cryptopro draft, when GOST ciphersuite is negotiated. Required for
-     * interoperability with CryptoPro CSP 3.x
-     */
-# define SSL_OP_CRYPTOPRO_TLSEXT_BUG                     SSL_OP_BIT(31)
+/* Disable Extended master secret */
+#define SSL_OP_NO_EXTENDED_MASTER_SECRET SSL_OP_BIT(0)
+/* Cleanse plaintext copies of data delivered to the application */
+#define SSL_OP_CLEANSE_PLAINTEXT SSL_OP_BIT(1)
+/* Allow initial connection to servers that don't support RI */
+#define SSL_OP_LEGACY_SERVER_CONNECT SSL_OP_BIT(2)
+/* Enable support for Kernel TLS */
+#define SSL_OP_ENABLE_KTLS SSL_OP_BIT(3)
+#define SSL_OP_TLSEXT_PADDING SSL_OP_BIT(4)
+#define SSL_OP_SAFARI_ECDHE_ECDSA_BUG SSL_OP_BIT(6)
+#define SSL_OP_IGNORE_UNEXPECTED_EOF SSL_OP_BIT(7)
+#define SSL_OP_ALLOW_CLIENT_RENEGOTIATION SSL_OP_BIT(8)
+#define SSL_OP_DISABLE_TLSEXT_CA_NAMES SSL_OP_BIT(9)
+/* In TLSv1.3 allow a non-(ec)dhe based kex_mode */
+#define SSL_OP_ALLOW_NO_DHE_KEX SSL_OP_BIT(10)
+/*
+ * Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added
+ * in OpenSSL 0.9.6d.  Usually (depending on the application protocol)
+ * the workaround is not needed.  Unfortunately some broken SSL/TLS
+ * implementations cannot handle it at all, which is why we include it
+ * in SSL_OP_ALL. Added in 0.9.6e
+ */
+#define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS SSL_OP_BIT(11)
+/* DTLS options */
+#define SSL_OP_NO_QUERY_MTU SSL_OP_BIT(12)
+/* Turn on Cookie Exchange (on relevant for servers) */
+#define SSL_OP_COOKIE_EXCHANGE SSL_OP_BIT(13)
+/* Don't use RFC4507 ticket extension */
+#define SSL_OP_NO_TICKET SSL_OP_BIT(14)
+#ifndef OPENSSL_NO_DTLS1_METHOD
+/*
+ * Use Cisco's version identifier of DTLS_BAD_VER
+ * (only with deprecated DTLSv1_client_method())
+ */
+#define SSL_OP_CISCO_ANYCONNECT SSL_OP_BIT(15)
+#endif
+/* As server, disallow session resumption on renegotiation */
+#define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION SSL_OP_BIT(16)
+/* Don't use compression even if supported */
+#define SSL_OP_NO_COMPRESSION SSL_OP_BIT(17)
+/* Permit unsafe legacy renegotiation */
+#define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION SSL_OP_BIT(18)
+/* Disable encrypt-then-mac */
+#define SSL_OP_NO_ENCRYPT_THEN_MAC SSL_OP_BIT(19)
+/*
+ * Enable TLSv1.3 Compatibility mode. This is on by default. A future
+ * version of OpenSSL may have this disabled by default.
+ */
+#define SSL_OP_ENABLE_MIDDLEBOX_COMPAT SSL_OP_BIT(20)
+/*
+ * Prioritize Chacha20Poly1305 when client does.
+ * Modifies SSL_OP_CIPHER_SERVER_PREFERENCE
+ */
+#define SSL_OP_PRIORITIZE_CHACHA SSL_OP_BIT(21)
+/*
+ * Set on servers to choose the cipher according to server's preferences.
+ */
+#define SSL_OP_CIPHER_SERVER_PREFERENCE SSL_OP_BIT(22)
+/*
+ * If set, a server will allow a client to issue an SSLv3.0 version
+ * number as latest version supported in the premaster secret, even when
+ * TLSv1.0 (version 3.1) was announced in the client hello. Normally
+ * this is forbidden to prevent version rollback attacks.
+ */
+#define SSL_OP_TLS_ROLLBACK_BUG SSL_OP_BIT(23)
+/*
+ * Switches off automatic TLSv1.3 anti-replay protection for early data.
+ * This is a server-side option only (no effect on the client).
+ */
+#define SSL_OP_NO_ANTI_REPLAY SSL_OP_BIT(24)
+#define SSL_OP_NO_SSLv3 SSL_OP_BIT(25)
+#define SSL_OP_NO_TLSv1 SSL_OP_BIT(26)
+#define SSL_OP_NO_TLSv1_2 SSL_OP_BIT(27)
+#define SSL_OP_NO_TLSv1_1 SSL_OP_BIT(28)
+#define SSL_OP_NO_TLSv1_3 SSL_OP_BIT(29)
+#define SSL_OP_NO_DTLSv1 SSL_OP_BIT(26)
+#define SSL_OP_NO_DTLSv1_2 SSL_OP_BIT(27)
+/* Disallow all renegotiation */
+#define SSL_OP_NO_RENEGOTIATION SSL_OP_BIT(30)
+/*
+ * Make server add server-hello extension from early version of
+ * cryptopro draft, when GOST ciphersuite is negotiated. Required for
+ * interoperability with CryptoPro CSP 3.x
+ */
+#define SSL_OP_CRYPTOPRO_TLSEXT_BUG SSL_OP_BIT(31)
 /*
  * Disable RFC8879 certificate compression
  * SSL_OP_NO_TX_CERTIFICATE_COMPRESSION: don't send compressed certificates,
@@ -419,79 +421,79 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
  * SSL_OP_NO_RX_CERTIFICATE_COMPRESSION: don't send the extension, and
  *     subsequently indicating that receiving is not supported
  */
-# define SSL_OP_NO_TX_CERTIFICATE_COMPRESSION            SSL_OP_BIT(32)
-# define SSL_OP_NO_RX_CERTIFICATE_COMPRESSION            SSL_OP_BIT(33)
-    /* Enable KTLS TX zerocopy on Linux */
-# define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE         SSL_OP_BIT(34)
+#define SSL_OP_NO_TX_CERTIFICATE_COMPRESSION SSL_OP_BIT(32)
+#define SSL_OP_NO_RX_CERTIFICATE_COMPRESSION SSL_OP_BIT(33)
+/* Enable KTLS TX zerocopy on Linux */
+#define SSL_OP_ENABLE_KTLS_TX_ZEROCOPY_SENDFILE SSL_OP_BIT(34)
 
-#define SSL_OP_PREFER_NO_DHE_KEX                         SSL_OP_BIT(35)
+#define SSL_OP_PREFER_NO_DHE_KEX SSL_OP_BIT(35)
 
 /*
  * Option "collections."
  */
-# define SSL_OP_NO_SSL_MASK \
-        ( SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 \
-          | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3 )
-# define SSL_OP_NO_DTLS_MASK \
-        ( SSL_OP_NO_DTLSv1 | SSL_OP_NO_DTLSv1_2 )
+#define SSL_OP_NO_SSL_MASK                                 \
+    (SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 \
+        | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3)
+#define SSL_OP_NO_DTLS_MASK \
+    (SSL_OP_NO_DTLSv1 | SSL_OP_NO_DTLSv1_2)
 
 /* Various bug workarounds that should be rather harmless. */
-# define SSL_OP_ALL \
-        ( SSL_OP_CRYPTOPRO_TLSEXT_BUG | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS \
-          | SSL_OP_TLSEXT_PADDING | SSL_OP_SAFARI_ECDHE_ECDSA_BUG )
+#define SSL_OP_ALL                                                    \
+    (SSL_OP_CRYPTOPRO_TLSEXT_BUG | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS \
+        | SSL_OP_TLSEXT_PADDING | SSL_OP_SAFARI_ECDHE_ECDSA_BUG)
 
 /*
  * OBSOLETE OPTIONS retained for compatibility
  */
 
-# define SSL_OP_MICROSOFT_SESS_ID_BUG                    0x0
-# define SSL_OP_NETSCAPE_CHALLENGE_BUG                   0x0
-# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x0
-# define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG              0x0
-# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER               0x0
-# define SSL_OP_MSIE_SSLV2_RSA_PADDING                   0x0
-# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG                 0x0
-# define SSL_OP_TLS_D5_BUG                               0x0
-# define SSL_OP_TLS_BLOCK_PADDING_BUG                    0x0
-# define SSL_OP_SINGLE_ECDH_USE                          0x0
-# define SSL_OP_SINGLE_DH_USE                            0x0
-# define SSL_OP_EPHEMERAL_RSA                            0x0
-# define SSL_OP_NO_SSLv2                                 0x0
-# define SSL_OP_PKCS1_CHECK_1                            0x0
-# define SSL_OP_PKCS1_CHECK_2                            0x0
-# define SSL_OP_NETSCAPE_CA_DN_BUG                       0x0
-# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG          0x0
+#define SSL_OP_MICROSOFT_SESS_ID_BUG 0x0
+#define SSL_OP_NETSCAPE_CHALLENGE_BUG 0x0
+#define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0
+#define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x0
+#define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x0
+#define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
+#define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x0
+#define SSL_OP_TLS_D5_BUG 0x0
+#define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0
+#define SSL_OP_SINGLE_ECDH_USE 0x0
+#define SSL_OP_SINGLE_DH_USE 0x0
+#define SSL_OP_EPHEMERAL_RSA 0x0
+#define SSL_OP_NO_SSLv2 0x0
+#define SSL_OP_PKCS1_CHECK_1 0x0
+#define SSL_OP_PKCS1_CHECK_2 0x0
+#define SSL_OP_NETSCAPE_CA_DN_BUG 0x0
+#define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0
 
 /*
  * Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
  * when just a single record has been written):
  */
-# define SSL_MODE_ENABLE_PARTIAL_WRITE       0x00000001U
+#define SSL_MODE_ENABLE_PARTIAL_WRITE 0x00000001U
 /*
  * Make it possible to retry SSL_write() with changed buffer location (buffer
  * contents must stay the same!); this is not the default to avoid the
  * misconception that non-blocking SSL_write() behaves like non-blocking
  * write():
  */
-# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002U
+#define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002U
 /*
  * Never bother the application with retries if the transport is blocking:
  */
-# define SSL_MODE_AUTO_RETRY 0x00000004U
+#define SSL_MODE_AUTO_RETRY 0x00000004U
 /* Don't attempt to automatically build certificate chain */
-# define SSL_MODE_NO_AUTO_CHAIN 0x00000008U
+#define SSL_MODE_NO_AUTO_CHAIN 0x00000008U
 /*
  * Save RAM by releasing read and write buffers when they're empty. (SSL3 and
  * TLS only.) Released buffers are freed.
  */
-# define SSL_MODE_RELEASE_BUFFERS 0x00000010U
+#define SSL_MODE_RELEASE_BUFFERS 0x00000010U
 /*
  * Send the current time in the Random fields of the ClientHello and
  * ServerHello records for compatibility with hypothetical implementations
  * that require it.
  */
-# define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020U
-# define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040U
+#define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020U
+#define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040U
 /*
  * Send TLS_FALLBACK_SCSV in the ClientHello. To be set only by applications
  * that reconnect with a downgraded protocol version; see
@@ -500,11 +502,11 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
  * fallback retries, following the guidance in
  * draft-ietf-tls-downgrade-scsv-00.
  */
-# define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080U
+#define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080U
 /*
  * Support Asynchronous operation
  */
-# define SSL_MODE_ASYNC 0x00000100U
+#define SSL_MODE_ASYNC 0x00000100U
 
 /*
  * When using DTLS/SCTP, include the terminating zero in the label
@@ -517,78 +519,78 @@ typedef int (*SSL_async_callback_fn)(SSL *s, void *arg);
  * - OpenSSL 1.1.0 series
  * - OpenSSL 1.1.1 and 1.1.1a
  */
-# define SSL_MODE_DTLS_SCTP_LABEL_LENGTH_BUG 0x00000400U
+#define SSL_MODE_DTLS_SCTP_LABEL_LENGTH_BUG 0x00000400U
 
 /* Cert related flags */
 /*
  * Many implementations ignore some aspects of the TLS standards such as
  * enforcing certificate chain algorithms. When this is set we enforce them.
  */
-# define SSL_CERT_FLAG_TLS_STRICT                0x00000001U
+#define SSL_CERT_FLAG_TLS_STRICT 0x00000001U
 
 /* Suite B modes, takes same values as certificate verify flags */
-# define SSL_CERT_FLAG_SUITEB_128_LOS_ONLY       0x10000
+#define SSL_CERT_FLAG_SUITEB_128_LOS_ONLY 0x10000
 /* Suite B 192 bit only mode */
-# define SSL_CERT_FLAG_SUITEB_192_LOS            0x20000
+#define SSL_CERT_FLAG_SUITEB_192_LOS 0x20000
 /* Suite B 128 bit mode allowing 192 bit algorithms */
-# define SSL_CERT_FLAG_SUITEB_128_LOS            0x30000
+#define SSL_CERT_FLAG_SUITEB_128_LOS 0x30000
 
 /* Perform all sorts of protocol violations for testing purposes */
-# define SSL_CERT_FLAG_BROKEN_PROTOCOL           0x10000000
+#define SSL_CERT_FLAG_BROKEN_PROTOCOL 0x10000000
 
 /* Flags for building certificate chains */
 /* Treat any existing certificates as untrusted CAs */
-# define SSL_BUILD_CHAIN_FLAG_UNTRUSTED          0x1
+#define SSL_BUILD_CHAIN_FLAG_UNTRUSTED 0x1
 /* Don't include root CA in chain */
-# define SSL_BUILD_CHAIN_FLAG_NO_ROOT            0x2
+#define SSL_BUILD_CHAIN_FLAG_NO_ROOT 0x2
 /* Just check certificates already there */
-# define SSL_BUILD_CHAIN_FLAG_CHECK              0x4
+#define SSL_BUILD_CHAIN_FLAG_CHECK 0x4
 /* Ignore verification errors */
-# define SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR       0x8
+#define SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR 0x8
 /* Clear verification errors from queue */
-# define SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR        0x10
+#define SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR 0x10
 
 /* Flags returned by SSL_check_chain */
 /* Certificate can be used with this session */
-# define CERT_PKEY_VALID         0x1
+#define CERT_PKEY_VALID 0x1
 /* Certificate can also be used for signing */
-# define CERT_PKEY_SIGN          0x2
+#define CERT_PKEY_SIGN 0x2
 /* EE certificate signing algorithm OK */
-# define CERT_PKEY_EE_SIGNATURE  0x10
+#define CERT_PKEY_EE_SIGNATURE 0x10
 /* CA signature algorithms OK */
-# define CERT_PKEY_CA_SIGNATURE  0x20
+#define CERT_PKEY_CA_SIGNATURE 0x20
 /* EE certificate parameters OK */
-# define CERT_PKEY_EE_PARAM      0x40
+#define CERT_PKEY_EE_PARAM 0x40
 /* CA certificate parameters OK */
-# define CERT_PKEY_CA_PARAM      0x80
+#define CERT_PKEY_CA_PARAM 0x80
 /* Signing explicitly allowed as opposed to SHA1 fallback */
-# define CERT_PKEY_EXPLICIT_SIGN 0x100
+#define CERT_PKEY_EXPLICIT_SIGN 0x100
 /* Client CA issuer names match (always set for server cert) */
-# define CERT_PKEY_ISSUER_NAME   0x200
+#define CERT_PKEY_ISSUER_NAME 0x200
 /* Cert type matches client types (always set for server cert) */
-# define CERT_PKEY_CERT_TYPE     0x400
+#define CERT_PKEY_CERT_TYPE 0x400
 /* Cert chain suitable to Suite B */
-# define CERT_PKEY_SUITEB        0x800
+#define CERT_PKEY_SUITEB 0x800
 /* Cert pkey valid for raw public key use */
-# define CERT_PKEY_RPK           0x1000
+#define CERT_PKEY_RPK 0x1000
 
-# define SSL_CONF_FLAG_CMDLINE           0x1
-# define SSL_CONF_FLAG_FILE              0x2
-# define SSL_CONF_FLAG_CLIENT            0x4
-# define SSL_CONF_FLAG_SERVER            0x8
-# define SSL_CONF_FLAG_SHOW_ERRORS       0x10
-# define SSL_CONF_FLAG_CERTIFICATE       0x20
-# define SSL_CONF_FLAG_REQUIRE_PRIVATE   0x40
+#define SSL_CONF_FLAG_CMDLINE 0x1
+#define SSL_CONF_FLAG_FILE 0x2
+#define SSL_CONF_FLAG_CLIENT 0x4
+#define SSL_CONF_FLAG_SERVER 0x8
+#define SSL_CONF_FLAG_SHOW_ERRORS 0x10
+#define SSL_CONF_FLAG_CERTIFICATE 0x20
+#define SSL_CONF_FLAG_REQUIRE_PRIVATE 0x40
 /* Configuration value types */
-# define SSL_CONF_TYPE_UNKNOWN           0x0
-# define SSL_CONF_TYPE_STRING            0x1
-# define SSL_CONF_TYPE_FILE              0x2
-# define SSL_CONF_TYPE_DIR               0x3
-# define SSL_CONF_TYPE_NONE              0x4
-# define SSL_CONF_TYPE_STORE             0x5
+#define SSL_CONF_TYPE_UNKNOWN 0x0
+#define SSL_CONF_TYPE_STRING 0x1
+#define SSL_CONF_TYPE_FILE 0x2
+#define SSL_CONF_TYPE_DIR 0x3
+#define SSL_CONF_TYPE_NONE 0x4
+#define SSL_CONF_TYPE_STORE 0x5
 
 /* Maximum length of the application-controlled segment of a a TLSv1.3 cookie */
-# define SSL_COOKIE_LENGTH                       4096
+#define SSL_COOKIE_LENGTH 4096
 
 /*
  * Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, they
@@ -602,68 +604,68 @@ uint64_t SSL_clear_options(SSL *s, uint64_t op);
 uint64_t SSL_CTX_set_options(SSL_CTX *ctx, uint64_t op);
 uint64_t SSL_set_options(SSL *s, uint64_t op);
 
-# define SSL_CTX_set_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
-# define SSL_CTX_clear_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_CTX_get_mode(ctx) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)
-# define SSL_clear_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_set_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)
-# define SSL_get_mode(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,0,NULL)
-# define SSL_set_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)
-# define DTLS_set_link_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),DTLS_CTRL_SET_LINK_MTU,(mtu),NULL)
-# define DTLS_get_link_min_mtu(ssl) \
-        SSL_ctrl((ssl),DTLS_CTRL_GET_LINK_MIN_MTU,0,NULL)
+#define SSL_CTX_set_mode(ctx, op) \
+    SSL_CTX_ctrl((ctx), SSL_CTRL_MODE, (op), NULL)
+#define SSL_CTX_clear_mode(ctx, op) \
+    SSL_CTX_ctrl((ctx), SSL_CTRL_CLEAR_MODE, (op), NULL)
+#define SSL_CTX_get_mode(ctx) \
+    SSL_CTX_ctrl((ctx), SSL_CTRL_MODE, 0, NULL)
+#define SSL_clear_mode(ssl, op) \
+    SSL_ctrl((ssl), SSL_CTRL_CLEAR_MODE, (op), NULL)
+#define SSL_set_mode(ssl, op) \
+    SSL_ctrl((ssl), SSL_CTRL_MODE, (op), NULL)
+#define SSL_get_mode(ssl) \
+    SSL_ctrl((ssl), SSL_CTRL_MODE, 0, NULL)
+#define SSL_set_mtu(ssl, mtu) \
+    SSL_ctrl((ssl), SSL_CTRL_SET_MTU, (mtu), NULL)
+#define DTLS_set_link_mtu(ssl, mtu) \
+    SSL_ctrl((ssl), DTLS_CTRL_SET_LINK_MTU, (mtu), NULL)
+#define DTLS_get_link_min_mtu(ssl) \
+    SSL_ctrl((ssl), DTLS_CTRL_GET_LINK_MIN_MTU, 0, NULL)
 
-# define SSL_get_secure_renegotiation_support(ssl) \
-        SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
+#define SSL_get_secure_renegotiation_support(ssl) \
+    SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
 
-# define SSL_CTX_set_cert_flags(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CERT_FLAGS,(op),NULL)
-# define SSL_set_cert_flags(s,op) \
-        SSL_ctrl((s),SSL_CTRL_CERT_FLAGS,(op),NULL)
-# define SSL_CTX_clear_cert_flags(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)
-# define SSL_clear_cert_flags(s,op) \
-        SSL_ctrl((s),SSL_CTRL_CLEAR_CERT_FLAGS,(op),NULL)
+#define SSL_CTX_set_cert_flags(ctx, op) \
+    SSL_CTX_ctrl((ctx), SSL_CTRL_CERT_FLAGS, (op), NULL)
+#define SSL_set_cert_flags(s, op) \
+    SSL_ctrl((s), SSL_CTRL_CERT_FLAGS, (op), NULL)
+#define SSL_CTX_clear_cert_flags(ctx, op) \
+    SSL_CTX_ctrl((ctx), SSL_CTRL_CLEAR_CERT_FLAGS, (op), NULL)
+#define SSL_clear_cert_flags(s, op) \
+    SSL_ctrl((s), SSL_CTRL_CLEAR_CERT_FLAGS, (op), NULL)
 
 void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
-                              void (*cb) (int write_p, int version,
-                                          int content_type, const void *buf,
-                                          size_t len, SSL *ssl, void *arg));
+    void (*cb)(int write_p, int version,
+        int content_type, const void *buf,
+        size_t len, SSL *ssl, void *arg));
 void SSL_set_msg_callback(SSL *ssl,
-                          void (*cb) (int write_p, int version,
-                                      int content_type, const void *buf,
-                                      size_t len, SSL *ssl, void *arg));
-# define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-# define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
+    void (*cb)(int write_p, int version,
+        int content_type, const void *buf,
+        size_t len, SSL *ssl, void *arg));
+#define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
+#define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
 
-# define SSL_get_extms_support(s) \
-        SSL_ctrl((s),SSL_CTRL_GET_EXTMS_SUPPORT,0,NULL)
+#define SSL_get_extms_support(s) \
+    SSL_ctrl((s), SSL_CTRL_GET_EXTMS_SUPPORT, 0, NULL)
 
-# ifndef OPENSSL_NO_SRP
+#ifndef OPENSSL_NO_SRP
 /* see tls_srp.c */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 __owur int SSL_SRP_CTX_init(SSL *s);
 OSSL_DEPRECATEDIN_3_0 __owur int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 int SSL_SRP_CTX_free(SSL *ctx);
 OSSL_DEPRECATEDIN_3_0 int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
 OSSL_DEPRECATEDIN_3_0 __owur int SSL_srp_server_param_with_username(SSL *s,
-                                                                    int *ad);
+    int *ad);
 OSSL_DEPRECATEDIN_3_0 __owur int SRP_Calc_A_param(SSL *s);
-#  endif
-# endif
+#endif
+#endif
 
 /* 100k max cert list */
-# define SSL_MAX_CERT_LIST_DEFAULT (1024*100)
+#define SSL_MAX_CERT_LIST_DEFAULT (1024 * 100)
 
-# define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)
+#define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT (1024 * 20)
 
 /*
  * This callback type is used inside SSL_CTX, SSL, and in the functions that
@@ -677,174 +679,174 @@ OSSL_DEPRECATEDIN_3_0 __owur int SRP_Calc_A_param(SSL *s);
  * bytes. The callback can alter this length to be less if desired. It is
  * also an error for the callback to set the size to zero.
  */
-typedef int (*GEN_SESSION_CB) (SSL *ssl, unsigned char *id,
-                               unsigned int *id_len);
+typedef int (*GEN_SESSION_CB)(SSL *ssl, unsigned char *id,
+    unsigned int *id_len);
 
-# define SSL_SESS_CACHE_OFF                      0x0000
-# define SSL_SESS_CACHE_CLIENT                   0x0001
-# define SSL_SESS_CACHE_SERVER                   0x0002
-# define SSL_SESS_CACHE_BOTH     (SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER)
-# define SSL_SESS_CACHE_NO_AUTO_CLEAR            0x0080
+#define SSL_SESS_CACHE_OFF 0x0000
+#define SSL_SESS_CACHE_CLIENT 0x0001
+#define SSL_SESS_CACHE_SERVER 0x0002
+#define SSL_SESS_CACHE_BOTH (SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_SERVER)
+#define SSL_SESS_CACHE_NO_AUTO_CLEAR 0x0080
 /* enough comments already ... see SSL_CTX_set_session_cache_mode(3) */
-# define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP       0x0100
-# define SSL_SESS_CACHE_NO_INTERNAL_STORE        0x0200
-# define SSL_SESS_CACHE_NO_INTERNAL \
-        (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP|SSL_SESS_CACHE_NO_INTERNAL_STORE)
-# define SSL_SESS_CACHE_UPDATE_TIME              0x0400
+#define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP 0x0100
+#define SSL_SESS_CACHE_NO_INTERNAL_STORE 0x0200
+#define SSL_SESS_CACHE_NO_INTERNAL \
+    (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP | SSL_SESS_CACHE_NO_INTERNAL_STORE)
+#define SSL_SESS_CACHE_UPDATE_TIME 0x0400
 
 LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
-# define SSL_CTX_sess_number(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_NUMBER,0,NULL)
-# define SSL_CTX_sess_connect(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT,0,NULL)
-# define SSL_CTX_sess_connect_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_GOOD,0,NULL)
-# define SSL_CTX_sess_connect_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT,0,NULL)
-# define SSL_CTX_sess_accept_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_GOOD,0,NULL)
-# define SSL_CTX_sess_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_HIT,0,NULL)
-# define SSL_CTX_sess_cb_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CB_HIT,0,NULL)
-# define SSL_CTX_sess_misses(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_MISSES,0,NULL)
-# define SSL_CTX_sess_timeouts(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_TIMEOUTS,0,NULL)
-# define SSL_CTX_sess_cache_full(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
+#define SSL_CTX_sess_number(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_NUMBER, 0, NULL)
+#define SSL_CTX_sess_connect(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_CONNECT, 0, NULL)
+#define SSL_CTX_sess_connect_good(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_CONNECT_GOOD, 0, NULL)
+#define SSL_CTX_sess_connect_renegotiate(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_CONNECT_RENEGOTIATE, 0, NULL)
+#define SSL_CTX_sess_accept(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_ACCEPT, 0, NULL)
+#define SSL_CTX_sess_accept_renegotiate(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_ACCEPT_RENEGOTIATE, 0, NULL)
+#define SSL_CTX_sess_accept_good(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_ACCEPT_GOOD, 0, NULL)
+#define SSL_CTX_sess_hits(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_HIT, 0, NULL)
+#define SSL_CTX_sess_cb_hits(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_CB_HIT, 0, NULL)
+#define SSL_CTX_sess_misses(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_MISSES, 0, NULL)
+#define SSL_CTX_sess_timeouts(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_TIMEOUTS, 0, NULL)
+#define SSL_CTX_sess_cache_full(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SESS_CACHE_FULL, 0, NULL)
 
 void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
-                             int (*new_session_cb) (struct ssl_st *ssl,
-                                                    SSL_SESSION *sess));
-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                              SSL_SESSION *sess);
+    int (*new_session_cb)(struct ssl_st *ssl,
+        SSL_SESSION *sess));
+int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl,
+    SSL_SESSION *sess);
 void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
-                                void (*remove_session_cb) (struct ssl_ctx_st
-                                                           *ctx,
-                                                           SSL_SESSION *sess));
-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx)) (struct ssl_ctx_st *ctx,
-                                                  SSL_SESSION *sess);
+    void (*remove_session_cb)(struct ssl_ctx_st
+                                  *ctx,
+        SSL_SESSION *sess));
+void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx,
+    SSL_SESSION *sess);
 void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
-                             SSL_SESSION *(*get_session_cb) (struct ssl_st
-                                                             *ssl,
-                                                             const unsigned char
-                                                             *data, int len,
-                                                             int *copy));
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                                       const unsigned char *data,
-                                                       int len, int *copy);
+    SSL_SESSION *(*get_session_cb)(struct ssl_st
+                                       *ssl,
+        const unsigned char
+            *data,
+        int len,
+        int *copy));
+SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl,
+    const unsigned char *data,
+    int len, int *copy);
 void SSL_CTX_set_info_callback(SSL_CTX *ctx,
-                               void (*cb) (const SSL *ssl, int type, int val));
-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx)) (const SSL *ssl, int type,
-                                                 int val);
+    void (*cb)(const SSL *ssl, int type, int val));
+void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl, int type,
+    int val);
 void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
-                                int (*client_cert_cb) (SSL *ssl, X509 **x509,
-                                                       EVP_PKEY **pkey));
-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx)) (SSL *ssl, X509 **x509,
-                                                 EVP_PKEY **pkey);
-# ifndef OPENSSL_NO_ENGINE
+    int (*client_cert_cb)(SSL *ssl, X509 **x509,
+        EVP_PKEY **pkey));
+int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509,
+    EVP_PKEY **pkey);
+#ifndef OPENSSL_NO_ENGINE
 __owur int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
-# endif
+#endif
 void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
-                                    int (*app_gen_cookie_cb) (SSL *ssl,
-                                                              unsigned char
-                                                              *cookie,
-                                                              unsigned int
-                                                              *cookie_len));
+    int (*app_gen_cookie_cb)(SSL *ssl,
+        unsigned char
+            *cookie,
+        unsigned int
+            *cookie_len));
 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
-                                  int (*app_verify_cookie_cb) (SSL *ssl,
-                                                               const unsigned
-                                                               char *cookie,
-                                                               unsigned int
-                                                               cookie_len));
+    int (*app_verify_cookie_cb)(SSL *ssl,
+        const unsigned char *cookie,
+        unsigned int
+            cookie_len));
 
 void SSL_CTX_set_stateless_cookie_generate_cb(
     SSL_CTX *ctx,
-    int (*gen_stateless_cookie_cb) (SSL *ssl,
-                                    unsigned char *cookie,
-                                    size_t *cookie_len));
+    int (*gen_stateless_cookie_cb)(SSL *ssl,
+        unsigned char *cookie,
+        size_t *cookie_len));
 void SSL_CTX_set_stateless_cookie_verify_cb(
     SSL_CTX *ctx,
-    int (*verify_stateless_cookie_cb) (SSL *ssl,
-                                       const unsigned char *cookie,
-                                       size_t cookie_len));
-# ifndef OPENSSL_NO_NEXTPROTONEG
+    int (*verify_stateless_cookie_cb)(SSL *ssl,
+        const unsigned char *cookie,
+        size_t cookie_len));
+#ifndef OPENSSL_NO_NEXTPROTONEG
 
 typedef int (*SSL_CTX_npn_advertised_cb_func)(SSL *ssl,
-                                              const unsigned char **out,
-                                              unsigned int *outlen,
-                                              void *arg);
+    const unsigned char **out,
+    unsigned int *outlen,
+    void *arg);
 void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s,
-                                           SSL_CTX_npn_advertised_cb_func cb,
-                                           void *arg);
-#  define SSL_CTX_set_npn_advertised_cb SSL_CTX_set_next_protos_advertised_cb
+    SSL_CTX_npn_advertised_cb_func cb,
+    void *arg);
+#define SSL_CTX_set_npn_advertised_cb SSL_CTX_set_next_protos_advertised_cb
 
 typedef int (*SSL_CTX_npn_select_cb_func)(SSL *s,
-                                          unsigned char **out,
-                                          unsigned char *outlen,
-                                          const unsigned char *in,
-                                          unsigned int inlen,
-                                          void *arg);
+    unsigned char **out,
+    unsigned char *outlen,
+    const unsigned char *in,
+    unsigned int inlen,
+    void *arg);
 void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s,
-                                      SSL_CTX_npn_select_cb_func cb,
-                                      void *arg);
-#  define SSL_CTX_set_npn_select_cb SSL_CTX_set_next_proto_select_cb
+    SSL_CTX_npn_select_cb_func cb,
+    void *arg);
+#define SSL_CTX_set_npn_select_cb SSL_CTX_set_next_proto_select_cb
 
 void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-                                    unsigned *len);
-#  define SSL_get0_npn_negotiated SSL_get0_next_proto_negotiated
-# endif
+    unsigned *len);
+#define SSL_get0_npn_negotiated SSL_get0_next_proto_negotiated
+#endif
 
 __owur int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
-                                 const unsigned char *in, unsigned int inlen,
-                                 const unsigned char *client,
-                                 unsigned int client_len);
+    const unsigned char *in, unsigned int inlen,
+    const unsigned char *client,
+    unsigned int client_len);
 
-# define OPENSSL_NPN_UNSUPPORTED 0
-# define OPENSSL_NPN_NEGOTIATED  1
-# define OPENSSL_NPN_NO_OVERLAP  2
+#define OPENSSL_NPN_UNSUPPORTED 0
+#define OPENSSL_NPN_NEGOTIATED 1
+#define OPENSSL_NPN_NO_OVERLAP 2
 
 __owur int SSL_CTX_set_alpn_protos(SSL_CTX *ctx, const unsigned char *protos,
-                                   unsigned int protos_len);
+    unsigned int protos_len);
 __owur int SSL_set_alpn_protos(SSL *ssl, const unsigned char *protos,
-                               unsigned int protos_len);
+    unsigned int protos_len);
 typedef int (*SSL_CTX_alpn_select_cb_func)(SSL *ssl,
-                                           const unsigned char **out,
-                                           unsigned char *outlen,
-                                           const unsigned char *in,
-                                           unsigned int inlen,
-                                           void *arg);
+    const unsigned char **out,
+    unsigned char *outlen,
+    const unsigned char *in,
+    unsigned int inlen,
+    void *arg);
 void SSL_CTX_set_alpn_select_cb(SSL_CTX *ctx,
-                                SSL_CTX_alpn_select_cb_func cb,
-                                void *arg);
+    SSL_CTX_alpn_select_cb_func cb,
+    void *arg);
 void SSL_get0_alpn_selected(const SSL *ssl, const unsigned char **data,
-                            unsigned int *len);
+    unsigned int *len);
 
-# ifndef OPENSSL_NO_PSK
+#ifndef OPENSSL_NO_PSK
 /*
  * the maximum length of the buffer given to callbacks containing the
  * resulting identity/psk
  */
-#  define PSK_MAX_IDENTITY_LEN 256
-#  define PSK_MAX_PSK_LEN 512
+#define PSK_MAX_IDENTITY_LEN 256
+#define PSK_MAX_PSK_LEN 512
 typedef unsigned int (*SSL_psk_client_cb_func)(SSL *ssl,
-                                               const char *hint,
-                                               char *identity,
-                                               unsigned int max_identity_len,
-                                               unsigned char *psk,
-                                               unsigned int max_psk_len);
+    const char *hint,
+    char *identity,
+    unsigned int max_identity_len,
+    unsigned char *psk,
+    unsigned int max_psk_len);
 void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx, SSL_psk_client_cb_func cb);
 void SSL_set_psk_client_callback(SSL *ssl, SSL_psk_client_cb_func cb);
 
 typedef unsigned int (*SSL_psk_server_cb_func)(SSL *ssl,
-                                               const char *identity,
-                                               unsigned char *psk,
-                                               unsigned int max_psk_len);
+    const char *identity,
+    unsigned char *psk,
+    unsigned int max_psk_len);
 void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx, SSL_psk_server_cb_func cb);
 void SSL_set_psk_server_callback(SSL *ssl, SSL_psk_server_cb_func cb);
 
@@ -852,78 +854,78 @@ __owur int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint
 __owur int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
 const char *SSL_get_psk_identity_hint(const SSL *s);
 const char *SSL_get_psk_identity(const SSL *s);
-# endif
+#endif
 
 typedef int (*SSL_psk_find_session_cb_func)(SSL *ssl,
-                                            const unsigned char *identity,
-                                            size_t identity_len,
-                                            SSL_SESSION **sess);
+    const unsigned char *identity,
+    size_t identity_len,
+    SSL_SESSION **sess);
 typedef int (*SSL_psk_use_session_cb_func)(SSL *ssl, const EVP_MD *md,
-                                           const unsigned char **id,
-                                           size_t *idlen,
-                                           SSL_SESSION **sess);
+    const unsigned char **id,
+    size_t *idlen,
+    SSL_SESSION **sess);
 
 void SSL_set_psk_find_session_callback(SSL *s, SSL_psk_find_session_cb_func cb);
 void SSL_CTX_set_psk_find_session_callback(SSL_CTX *ctx,
-                                           SSL_psk_find_session_cb_func cb);
+    SSL_psk_find_session_cb_func cb);
 void SSL_set_psk_use_session_callback(SSL *s, SSL_psk_use_session_cb_func cb);
 void SSL_CTX_set_psk_use_session_callback(SSL_CTX *ctx,
-                                          SSL_psk_use_session_cb_func cb);
+    SSL_psk_use_session_cb_func cb);
 
 /* Register callbacks to handle custom TLS Extensions for client or server. */
 
 __owur int SSL_CTX_has_client_custom_ext(const SSL_CTX *ctx,
-                                         unsigned int ext_type);
+    unsigned int ext_type);
 
 __owur int SSL_CTX_add_client_custom_ext(SSL_CTX *ctx,
-                                         unsigned int ext_type,
-                                         custom_ext_add_cb add_cb,
-                                         custom_ext_free_cb free_cb,
-                                         void *add_arg,
-                                         custom_ext_parse_cb parse_cb,
-                                         void *parse_arg);
+    unsigned int ext_type,
+    custom_ext_add_cb add_cb,
+    custom_ext_free_cb free_cb,
+    void *add_arg,
+    custom_ext_parse_cb parse_cb,
+    void *parse_arg);
 
 __owur int SSL_CTX_add_server_custom_ext(SSL_CTX *ctx,
-                                         unsigned int ext_type,
-                                         custom_ext_add_cb add_cb,
-                                         custom_ext_free_cb free_cb,
-                                         void *add_arg,
-                                         custom_ext_parse_cb parse_cb,
-                                         void *parse_arg);
+    unsigned int ext_type,
+    custom_ext_add_cb add_cb,
+    custom_ext_free_cb free_cb,
+    void *add_arg,
+    custom_ext_parse_cb parse_cb,
+    void *parse_arg);
 
 __owur int SSL_CTX_add_custom_ext(SSL_CTX *ctx, unsigned int ext_type,
-                                  unsigned int context,
-                                  SSL_custom_ext_add_cb_ex add_cb,
-                                  SSL_custom_ext_free_cb_ex free_cb,
-                                  void *add_arg,
-                                  SSL_custom_ext_parse_cb_ex parse_cb,
-                                  void *parse_arg);
+    unsigned int context,
+    SSL_custom_ext_add_cb_ex add_cb,
+    SSL_custom_ext_free_cb_ex free_cb,
+    void *add_arg,
+    SSL_custom_ext_parse_cb_ex parse_cb,
+    void *parse_arg);
 
 __owur int SSL_extension_supported(unsigned int ext_type);
 
-# define SSL_NOTHING            1
-# define SSL_WRITING            2
-# define SSL_READING            3
-# define SSL_X509_LOOKUP        4
-# define SSL_ASYNC_PAUSED       5
-# define SSL_ASYNC_NO_JOBS      6
-# define SSL_CLIENT_HELLO_CB    7
-# define SSL_RETRY_VERIFY       8
+#define SSL_NOTHING 1
+#define SSL_WRITING 2
+#define SSL_READING 3
+#define SSL_X509_LOOKUP 4
+#define SSL_ASYNC_PAUSED 5
+#define SSL_ASYNC_NO_JOBS 6
+#define SSL_CLIENT_HELLO_CB 7
+#define SSL_RETRY_VERIFY 8
 
 /* These will only be used when doing non-blocking IO */
-# define SSL_want_nothing(s)         (SSL_want(s) == SSL_NOTHING)
-# define SSL_want_read(s)            (SSL_want(s) == SSL_READING)
-# define SSL_want_write(s)           (SSL_want(s) == SSL_WRITING)
-# define SSL_want_x509_lookup(s)     (SSL_want(s) == SSL_X509_LOOKUP)
-# define SSL_want_retry_verify(s)    (SSL_want(s) == SSL_RETRY_VERIFY)
-# define SSL_want_async(s)           (SSL_want(s) == SSL_ASYNC_PAUSED)
-# define SSL_want_async_job(s)       (SSL_want(s) == SSL_ASYNC_NO_JOBS)
-# define SSL_want_client_hello_cb(s) (SSL_want(s) == SSL_CLIENT_HELLO_CB)
+#define SSL_want_nothing(s) (SSL_want(s) == SSL_NOTHING)
+#define SSL_want_read(s) (SSL_want(s) == SSL_READING)
+#define SSL_want_write(s) (SSL_want(s) == SSL_WRITING)
+#define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP)
+#define SSL_want_retry_verify(s) (SSL_want(s) == SSL_RETRY_VERIFY)
+#define SSL_want_async(s) (SSL_want(s) == SSL_ASYNC_PAUSED)
+#define SSL_want_async_job(s) (SSL_want(s) == SSL_ASYNC_NO_JOBS)
+#define SSL_want_client_hello_cb(s) (SSL_want(s) == SSL_CLIENT_HELLO_CB)
 
-# define SSL_MAC_FLAG_READ_MAC_STREAM 1
-# define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
-# define SSL_MAC_FLAG_READ_MAC_TLSTREE 4
-# define SSL_MAC_FLAG_WRITE_MAC_TLSTREE 8
+#define SSL_MAC_FLAG_READ_MAC_STREAM 1
+#define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
+#define SSL_MAC_FLAG_READ_MAC_TLSTREE 4
+#define SSL_MAC_FLAG_WRITE_MAC_TLSTREE 8
 
 /*
  * A callback for logging out TLS key material. This callback should log out
@@ -957,14 +959,14 @@ uint32_t SSL_get_recv_max_early_data(const SSL *s);
 }
 #endif
 
-# include <openssl/ssl2.h>
-# include <openssl/ssl3.h>
-# include <openssl/tls1.h>      /* This is mostly sslv3 with a few tweaks */
-# include <openssl/dtls1.h>     /* Datagram TLS */
-# include <openssl/srtp.h>      /* Support for the use_srtp extension */
-# include <openssl/quic.h>
+#include <openssl/ssl2.h>
+#include <openssl/ssl3.h>
+#include <openssl/tls1.h> /* This is mostly sslv3 with a few tweaks */
+#include <openssl/dtls1.h> /* Datagram TLS */
+#include <openssl/srtp.h> /* Support for the use_srtp extension */
+#include <openssl/quic.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -972,29 +974,31 @@ extern "C" {
  * These need to be after the above set of includes due to a compiler bug
  * in VisualStudio 2015
  */
+/* clang-format off */
 {-
     generate_const_stack_macros("SSL_CIPHER");
 -}
+/* clang-format on */
 
 /* compatibility */
-# define SSL_set_app_data(s,arg)         (SSL_set_ex_data(s,0,(char *)(arg)))
-# define SSL_get_app_data(s)             (SSL_get_ex_data(s,0))
-# define SSL_SESSION_set_app_data(s,a)   (SSL_SESSION_set_ex_data(s,0, \
-                                                                  (char *)(a)))
-# define SSL_SESSION_get_app_data(s)     (SSL_SESSION_get_ex_data(s,0))
-# define SSL_CTX_get_app_data(ctx)       (SSL_CTX_get_ex_data(ctx,0))
-# define SSL_CTX_set_app_data(ctx,arg)   (SSL_CTX_set_ex_data(ctx,0, \
-                                                              (char *)(arg)))
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define SSL_set_app_data(s, arg) (SSL_set_ex_data(s, 0, (char *)(arg)))
+#define SSL_get_app_data(s) (SSL_get_ex_data(s, 0))
+#define SSL_SESSION_set_app_data(s, a) (SSL_SESSION_set_ex_data(s, 0, \
+    (char *)(a)))
+#define SSL_SESSION_get_app_data(s) (SSL_SESSION_get_ex_data(s, 0))
+#define SSL_CTX_get_app_data(ctx) (SSL_CTX_get_ex_data(ctx, 0))
+#define SSL_CTX_set_app_data(ctx, arg) (SSL_CTX_set_ex_data(ctx, 0, \
+    (char *)(arg)))
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 void SSL_set_debug(SSL *s, int debug);
-# endif
+#endif
 
 /* TLSv1.3 KeyUpdate message types */
 /* -1 used so that this is an invalid value for the on-the-wire protocol */
-#define SSL_KEY_UPDATE_NONE             -1
+#define SSL_KEY_UPDATE_NONE -1
 /* Values as defined for the on-the-wire protocol */
-#define SSL_KEY_UPDATE_NOT_REQUESTED     0
-#define SSL_KEY_UPDATE_REQUESTED         1
+#define SSL_KEY_UPDATE_NOT_REQUESTED 0
+#define SSL_KEY_UPDATE_REQUESTED 1
 
 /*
  * The valid handshake states (one for each type message sent and one for each
@@ -1073,28 +1077,28 @@ typedef enum {
  * SSL_CB_ACCEPT_EXIT, SSL_CB_CONNECT_LOOP and SSL_CB_CONNECT_EXIT.
  */
 
-# define SSL_ST_CONNECT                  0x1000
-# define SSL_ST_ACCEPT                   0x2000
+#define SSL_ST_CONNECT 0x1000
+#define SSL_ST_ACCEPT 0x2000
 
-# define SSL_ST_MASK                     0x0FFF
+#define SSL_ST_MASK 0x0FFF
 
-# define SSL_CB_LOOP                     0x01
-# define SSL_CB_EXIT                     0x02
-# define SSL_CB_READ                     0x04
-# define SSL_CB_WRITE                    0x08
-# define SSL_CB_ALERT                    0x4000/* used in callback */
-# define SSL_CB_READ_ALERT               (SSL_CB_ALERT|SSL_CB_READ)
-# define SSL_CB_WRITE_ALERT              (SSL_CB_ALERT|SSL_CB_WRITE)
-# define SSL_CB_ACCEPT_LOOP              (SSL_ST_ACCEPT|SSL_CB_LOOP)
-# define SSL_CB_ACCEPT_EXIT              (SSL_ST_ACCEPT|SSL_CB_EXIT)
-# define SSL_CB_CONNECT_LOOP             (SSL_ST_CONNECT|SSL_CB_LOOP)
-# define SSL_CB_CONNECT_EXIT             (SSL_ST_CONNECT|SSL_CB_EXIT)
-# define SSL_CB_HANDSHAKE_START          0x10
-# define SSL_CB_HANDSHAKE_DONE           0x20
+#define SSL_CB_LOOP 0x01
+#define SSL_CB_EXIT 0x02
+#define SSL_CB_READ 0x04
+#define SSL_CB_WRITE 0x08
+#define SSL_CB_ALERT 0x4000 /* used in callback */
+#define SSL_CB_READ_ALERT (SSL_CB_ALERT | SSL_CB_READ)
+#define SSL_CB_WRITE_ALERT (SSL_CB_ALERT | SSL_CB_WRITE)
+#define SSL_CB_ACCEPT_LOOP (SSL_ST_ACCEPT | SSL_CB_LOOP)
+#define SSL_CB_ACCEPT_EXIT (SSL_ST_ACCEPT | SSL_CB_EXIT)
+#define SSL_CB_CONNECT_LOOP (SSL_ST_CONNECT | SSL_CB_LOOP)
+#define SSL_CB_CONNECT_EXIT (SSL_ST_CONNECT | SSL_CB_EXIT)
+#define SSL_CB_HANDSHAKE_START 0x10
+#define SSL_CB_HANDSHAKE_DONE 0x20
 
 /* Is the SSL_connection established? */
-# define SSL_in_connect_init(a)          (SSL_in_init(a) && !SSL_is_server(a))
-# define SSL_in_accept_init(a)           (SSL_in_init(a) && SSL_is_server(a))
+#define SSL_in_connect_init(a) (SSL_in_init(a) && !SSL_is_server(a))
+#define SSL_in_accept_init(a) (SSL_in_init(a) && SSL_is_server(a))
 int SSL_in_init(const SSL *s);
 int SSL_in_before(const SSL *s);
 int SSL_is_init_finished(const SSL *s);
@@ -1103,9 +1107,9 @@ int SSL_is_init_finished(const SSL *s);
  * The following 3 states are kept in ssl->rlayer.rstate when reads fail, you
  * should not need these
  */
-# define SSL_ST_READ_HEADER                      0xF0
-# define SSL_ST_READ_BODY                        0xF1
-# define SSL_ST_READ_DONE                        0xF2
+#define SSL_ST_READ_HEADER 0xF0
+#define SSL_ST_READ_BODY 0xF1
+#define SSL_ST_READ_DONE 0xF2
 
 /*-
  * Obtain latest Finished message
@@ -1120,408 +1124,408 @@ size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
  * use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 3 options are
  * 'ored' with SSL_VERIFY_PEER if they are desired
  */
-# define SSL_VERIFY_NONE                 0x00
-# define SSL_VERIFY_PEER                 0x01
-# define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
-# define SSL_VERIFY_CLIENT_ONCE          0x04
-# define SSL_VERIFY_POST_HANDSHAKE       0x08
+#define SSL_VERIFY_NONE 0x00
+#define SSL_VERIFY_PEER 0x01
+#define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
+#define SSL_VERIFY_CLIENT_ONCE 0x04
+#define SSL_VERIFY_POST_HANDSHAKE 0x08
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define OpenSSL_add_ssl_algorithms()   SSL_library_init()
-#  define SSLeay_add_ssl_algorithms()    SSL_library_init()
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define OpenSSL_add_ssl_algorithms() SSL_library_init()
+#define SSLeay_add_ssl_algorithms() SSL_library_init()
+#endif
 
 /* More backward compatibility */
-# define SSL_get_cipher(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_cipher_bits(s,np) \
-                SSL_CIPHER_get_bits(SSL_get_current_cipher(s),np)
-# define SSL_get_cipher_version(s) \
-                SSL_CIPHER_get_version(SSL_get_current_cipher(s))
-# define SSL_get_cipher_name(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_time(a)         SSL_SESSION_get_time(a)
-# define SSL_set_time(a,b)       SSL_SESSION_set_time((a),(b))
-# define SSL_get_timeout(a)      SSL_SESSION_get_timeout(a)
-# define SSL_set_timeout(a,b)    SSL_SESSION_set_timeout((a),(b))
+#define SSL_get_cipher(s) \
+    SSL_CIPHER_get_name(SSL_get_current_cipher(s))
+#define SSL_get_cipher_bits(s, np) \
+    SSL_CIPHER_get_bits(SSL_get_current_cipher(s), np)
+#define SSL_get_cipher_version(s) \
+    SSL_CIPHER_get_version(SSL_get_current_cipher(s))
+#define SSL_get_cipher_name(s) \
+    SSL_CIPHER_get_name(SSL_get_current_cipher(s))
+#define SSL_get_time(a) SSL_SESSION_get_time(a)
+#define SSL_set_time(a, b) SSL_SESSION_set_time((a), (b))
+#define SSL_get_timeout(a) SSL_SESSION_get_timeout(a)
+#define SSL_set_timeout(a, b) SSL_SESSION_set_timeout((a), (b))
 
-# define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
-# define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
+#define d2i_SSL_SESSION_bio(bp, s_id) ASN1_d2i_bio_of(SSL_SESSION, SSL_SESSION_new, d2i_SSL_SESSION, bp, s_id)
+#define i2d_SSL_SESSION_bio(bp, s_id) ASN1_i2d_bio_of(SSL_SESSION, i2d_SSL_SESSION, bp, s_id)
 
 DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
-# define SSL_AD_REASON_OFFSET            1000/* offset to get SSL_R_... value
-                                              * from SSL_AD_... */
+#define SSL_AD_REASON_OFFSET 1000 /* offset to get SSL_R_... value \
+                                   * from SSL_AD_... */
 /* These alert types are for SSLv3 and TLSv1 */
-# define SSL_AD_CLOSE_NOTIFY             SSL3_AD_CLOSE_NOTIFY
+#define SSL_AD_CLOSE_NOTIFY SSL3_AD_CLOSE_NOTIFY
 /* fatal */
-# define SSL_AD_UNEXPECTED_MESSAGE       SSL3_AD_UNEXPECTED_MESSAGE
+#define SSL_AD_UNEXPECTED_MESSAGE SSL3_AD_UNEXPECTED_MESSAGE
 /* fatal */
-# define SSL_AD_BAD_RECORD_MAC           SSL3_AD_BAD_RECORD_MAC
-# define SSL_AD_DECRYPTION_FAILED        TLS1_AD_DECRYPTION_FAILED
-# define SSL_AD_RECORD_OVERFLOW          TLS1_AD_RECORD_OVERFLOW
+#define SSL_AD_BAD_RECORD_MAC SSL3_AD_BAD_RECORD_MAC
+#define SSL_AD_DECRYPTION_FAILED TLS1_AD_DECRYPTION_FAILED
+#define SSL_AD_RECORD_OVERFLOW TLS1_AD_RECORD_OVERFLOW
 /* fatal */
-# define SSL_AD_DECOMPRESSION_FAILURE    SSL3_AD_DECOMPRESSION_FAILURE
+#define SSL_AD_DECOMPRESSION_FAILURE SSL3_AD_DECOMPRESSION_FAILURE
 /* fatal */
-# define SSL_AD_HANDSHAKE_FAILURE        SSL3_AD_HANDSHAKE_FAILURE
+#define SSL_AD_HANDSHAKE_FAILURE SSL3_AD_HANDSHAKE_FAILURE
 /* Not for TLS */
-# define SSL_AD_NO_CERTIFICATE           SSL3_AD_NO_CERTIFICATE
-# define SSL_AD_BAD_CERTIFICATE          SSL3_AD_BAD_CERTIFICATE
-# define SSL_AD_UNSUPPORTED_CERTIFICATE  SSL3_AD_UNSUPPORTED_CERTIFICATE
-# define SSL_AD_CERTIFICATE_REVOKED      SSL3_AD_CERTIFICATE_REVOKED
-# define SSL_AD_CERTIFICATE_EXPIRED      SSL3_AD_CERTIFICATE_EXPIRED
-# define SSL_AD_CERTIFICATE_UNKNOWN      SSL3_AD_CERTIFICATE_UNKNOWN
+#define SSL_AD_NO_CERTIFICATE SSL3_AD_NO_CERTIFICATE
+#define SSL_AD_BAD_CERTIFICATE SSL3_AD_BAD_CERTIFICATE
+#define SSL_AD_UNSUPPORTED_CERTIFICATE SSL3_AD_UNSUPPORTED_CERTIFICATE
+#define SSL_AD_CERTIFICATE_REVOKED SSL3_AD_CERTIFICATE_REVOKED
+#define SSL_AD_CERTIFICATE_EXPIRED SSL3_AD_CERTIFICATE_EXPIRED
+#define SSL_AD_CERTIFICATE_UNKNOWN SSL3_AD_CERTIFICATE_UNKNOWN
 /* fatal */
-# define SSL_AD_ILLEGAL_PARAMETER        SSL3_AD_ILLEGAL_PARAMETER
+#define SSL_AD_ILLEGAL_PARAMETER SSL3_AD_ILLEGAL_PARAMETER
 /* fatal */
-# define SSL_AD_UNKNOWN_CA               TLS1_AD_UNKNOWN_CA
+#define SSL_AD_UNKNOWN_CA TLS1_AD_UNKNOWN_CA
 /* fatal */
-# define SSL_AD_ACCESS_DENIED            TLS1_AD_ACCESS_DENIED
+#define SSL_AD_ACCESS_DENIED TLS1_AD_ACCESS_DENIED
 /* fatal */
-# define SSL_AD_DECODE_ERROR             TLS1_AD_DECODE_ERROR
-# define SSL_AD_DECRYPT_ERROR            TLS1_AD_DECRYPT_ERROR
+#define SSL_AD_DECODE_ERROR TLS1_AD_DECODE_ERROR
+#define SSL_AD_DECRYPT_ERROR TLS1_AD_DECRYPT_ERROR
 /* fatal */
-# define SSL_AD_EXPORT_RESTRICTION       TLS1_AD_EXPORT_RESTRICTION
+#define SSL_AD_EXPORT_RESTRICTION TLS1_AD_EXPORT_RESTRICTION
 /* fatal */
-# define SSL_AD_PROTOCOL_VERSION         TLS1_AD_PROTOCOL_VERSION
+#define SSL_AD_PROTOCOL_VERSION TLS1_AD_PROTOCOL_VERSION
 /* fatal */
-# define SSL_AD_INSUFFICIENT_SECURITY    TLS1_AD_INSUFFICIENT_SECURITY
+#define SSL_AD_INSUFFICIENT_SECURITY TLS1_AD_INSUFFICIENT_SECURITY
 /* fatal */
-# define SSL_AD_INTERNAL_ERROR           TLS1_AD_INTERNAL_ERROR
-# define SSL_AD_USER_CANCELLED           TLS1_AD_USER_CANCELLED
-# define SSL_AD_NO_RENEGOTIATION         TLS1_AD_NO_RENEGOTIATION
-# define SSL_AD_MISSING_EXTENSION        TLS13_AD_MISSING_EXTENSION
-# define SSL_AD_CERTIFICATE_REQUIRED     TLS13_AD_CERTIFICATE_REQUIRED
-# define SSL_AD_UNSUPPORTED_EXTENSION    TLS1_AD_UNSUPPORTED_EXTENSION
-# define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
-# define SSL_AD_UNRECOGNIZED_NAME        TLS1_AD_UNRECOGNIZED_NAME
-# define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
-# define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
+#define SSL_AD_INTERNAL_ERROR TLS1_AD_INTERNAL_ERROR
+#define SSL_AD_USER_CANCELLED TLS1_AD_USER_CANCELLED
+#define SSL_AD_NO_RENEGOTIATION TLS1_AD_NO_RENEGOTIATION
+#define SSL_AD_MISSING_EXTENSION TLS13_AD_MISSING_EXTENSION
+#define SSL_AD_CERTIFICATE_REQUIRED TLS13_AD_CERTIFICATE_REQUIRED
+#define SSL_AD_UNSUPPORTED_EXTENSION TLS1_AD_UNSUPPORTED_EXTENSION
+#define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
+#define SSL_AD_UNRECOGNIZED_NAME TLS1_AD_UNRECOGNIZED_NAME
+#define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
+#define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
 /* fatal */
-# define SSL_AD_UNKNOWN_PSK_IDENTITY     TLS1_AD_UNKNOWN_PSK_IDENTITY
+#define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY
 /* fatal */
-# define SSL_AD_INAPPROPRIATE_FALLBACK   TLS1_AD_INAPPROPRIATE_FALLBACK
-# define SSL_AD_NO_APPLICATION_PROTOCOL  TLS1_AD_NO_APPLICATION_PROTOCOL
-# define SSL_ERROR_NONE                  0
-# define SSL_ERROR_SSL                   1
-# define SSL_ERROR_WANT_READ             2
-# define SSL_ERROR_WANT_WRITE            3
-# define SSL_ERROR_WANT_X509_LOOKUP      4
-# define SSL_ERROR_SYSCALL               5/* look at error stack/return
-                                           * value/errno */
-# define SSL_ERROR_ZERO_RETURN           6
-# define SSL_ERROR_WANT_CONNECT          7
-# define SSL_ERROR_WANT_ACCEPT           8
-# define SSL_ERROR_WANT_ASYNC            9
-# define SSL_ERROR_WANT_ASYNC_JOB       10
-# define SSL_ERROR_WANT_CLIENT_HELLO_CB 11
-# define SSL_ERROR_WANT_RETRY_VERIFY    12
+#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK
+#define SSL_AD_NO_APPLICATION_PROTOCOL TLS1_AD_NO_APPLICATION_PROTOCOL
+#define SSL_ERROR_NONE 0
+#define SSL_ERROR_SSL 1
+#define SSL_ERROR_WANT_READ 2
+#define SSL_ERROR_WANT_WRITE 3
+#define SSL_ERROR_WANT_X509_LOOKUP 4
+#define SSL_ERROR_SYSCALL 5 /* look at error stack/return \
+                             * value/errno */
+#define SSL_ERROR_ZERO_RETURN 6
+#define SSL_ERROR_WANT_CONNECT 7
+#define SSL_ERROR_WANT_ACCEPT 8
+#define SSL_ERROR_WANT_ASYNC 9
+#define SSL_ERROR_WANT_ASYNC_JOB 10
+#define SSL_ERROR_WANT_CLIENT_HELLO_CB 11
+#define SSL_ERROR_WANT_RETRY_VERIFY 12
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_CTRL_SET_TMP_DH                    3
-#  define SSL_CTRL_SET_TMP_ECDH                  4
-#  define SSL_CTRL_SET_TMP_DH_CB                 6
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_CTRL_SET_TMP_DH 3
+#define SSL_CTRL_SET_TMP_ECDH 4
+#define SSL_CTRL_SET_TMP_DH_CB 6
+#endif
 
-# define SSL_CTRL_GET_CLIENT_CERT_REQUEST        9
-# define SSL_CTRL_GET_NUM_RENEGOTIATIONS         10
-# define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS       11
-# define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS       12
-# define SSL_CTRL_GET_FLAGS                      13
-# define SSL_CTRL_EXTRA_CHAIN_CERT               14
-# define SSL_CTRL_SET_MSG_CALLBACK               15
-# define SSL_CTRL_SET_MSG_CALLBACK_ARG           16
+#define SSL_CTRL_GET_CLIENT_CERT_REQUEST 9
+#define SSL_CTRL_GET_NUM_RENEGOTIATIONS 10
+#define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS 11
+#define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS 12
+#define SSL_CTRL_GET_FLAGS 13
+#define SSL_CTRL_EXTRA_CHAIN_CERT 14
+#define SSL_CTRL_SET_MSG_CALLBACK 15
+#define SSL_CTRL_SET_MSG_CALLBACK_ARG 16
 /* only applies to datagram connections */
-# define SSL_CTRL_SET_MTU                17
+#define SSL_CTRL_SET_MTU 17
 /* Stats */
-# define SSL_CTRL_SESS_NUMBER                    20
-# define SSL_CTRL_SESS_CONNECT                   21
-# define SSL_CTRL_SESS_CONNECT_GOOD              22
-# define SSL_CTRL_SESS_CONNECT_RENEGOTIATE       23
-# define SSL_CTRL_SESS_ACCEPT                    24
-# define SSL_CTRL_SESS_ACCEPT_GOOD               25
-# define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE        26
-# define SSL_CTRL_SESS_HIT                       27
-# define SSL_CTRL_SESS_CB_HIT                    28
-# define SSL_CTRL_SESS_MISSES                    29
-# define SSL_CTRL_SESS_TIMEOUTS                  30
-# define SSL_CTRL_SESS_CACHE_FULL                31
-# define SSL_CTRL_MODE                           33
-# define SSL_CTRL_GET_READ_AHEAD                 40
-# define SSL_CTRL_SET_READ_AHEAD                 41
-# define SSL_CTRL_SET_SESS_CACHE_SIZE            42
-# define SSL_CTRL_GET_SESS_CACHE_SIZE            43
-# define SSL_CTRL_SET_SESS_CACHE_MODE            44
-# define SSL_CTRL_GET_SESS_CACHE_MODE            45
-# define SSL_CTRL_GET_MAX_CERT_LIST              50
-# define SSL_CTRL_SET_MAX_CERT_LIST              51
-# define SSL_CTRL_SET_MAX_SEND_FRAGMENT          52
+#define SSL_CTRL_SESS_NUMBER 20
+#define SSL_CTRL_SESS_CONNECT 21
+#define SSL_CTRL_SESS_CONNECT_GOOD 22
+#define SSL_CTRL_SESS_CONNECT_RENEGOTIATE 23
+#define SSL_CTRL_SESS_ACCEPT 24
+#define SSL_CTRL_SESS_ACCEPT_GOOD 25
+#define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE 26
+#define SSL_CTRL_SESS_HIT 27
+#define SSL_CTRL_SESS_CB_HIT 28
+#define SSL_CTRL_SESS_MISSES 29
+#define SSL_CTRL_SESS_TIMEOUTS 30
+#define SSL_CTRL_SESS_CACHE_FULL 31
+#define SSL_CTRL_MODE 33
+#define SSL_CTRL_GET_READ_AHEAD 40
+#define SSL_CTRL_SET_READ_AHEAD 41
+#define SSL_CTRL_SET_SESS_CACHE_SIZE 42
+#define SSL_CTRL_GET_SESS_CACHE_SIZE 43
+#define SSL_CTRL_SET_SESS_CACHE_MODE 44
+#define SSL_CTRL_GET_SESS_CACHE_MODE 45
+#define SSL_CTRL_GET_MAX_CERT_LIST 50
+#define SSL_CTRL_SET_MAX_CERT_LIST 51
+#define SSL_CTRL_SET_MAX_SEND_FRAGMENT 52
 /* see tls1.h for macros based on these */
-# define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB       53
-# define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG      54
-# define SSL_CTRL_SET_TLSEXT_HOSTNAME            55
-# define SSL_CTRL_SET_TLSEXT_DEBUG_CB            56
-# define SSL_CTRL_SET_TLSEXT_DEBUG_ARG           57
-# define SSL_CTRL_GET_TLSEXT_TICKET_KEYS         58
-# define SSL_CTRL_SET_TLSEXT_TICKET_KEYS         59
+#define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB 53
+#define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG 54
+#define SSL_CTRL_SET_TLSEXT_HOSTNAME 55
+#define SSL_CTRL_SET_TLSEXT_DEBUG_CB 56
+#define SSL_CTRL_SET_TLSEXT_DEBUG_ARG 57
+#define SSL_CTRL_GET_TLSEXT_TICKET_KEYS 58
+#define SSL_CTRL_SET_TLSEXT_TICKET_KEYS 59
 /*# define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT    60 */
 /*# define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB 61 */
 /*# define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG 62 */
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB       63
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG   64
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE     65
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS     66
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS     67
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS      68
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS      69
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP        70
-# define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP        71
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB      72
-# endif
-# define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB    75
-# define SSL_CTRL_SET_SRP_VERIFY_PARAM_CB                76
-# define SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB             77
-# define SSL_CTRL_SET_SRP_ARG            78
-# define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME               79
-# define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH               80
-# define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD               81
-# define DTLS_CTRL_GET_TIMEOUT           73
-# define DTLS_CTRL_HANDLE_TIMEOUT        74
-# define SSL_CTRL_GET_RI_SUPPORT                 76
-# define SSL_CTRL_CLEAR_MODE                     78
-# define SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB      79
-# define SSL_CTRL_GET_EXTRA_CHAIN_CERTS          82
-# define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS        83
-# define SSL_CTRL_CHAIN                          88
-# define SSL_CTRL_CHAIN_CERT                     89
-# define SSL_CTRL_GET_GROUPS                     90
-# define SSL_CTRL_SET_GROUPS                     91
-# define SSL_CTRL_SET_GROUPS_LIST                92
-# define SSL_CTRL_GET_SHARED_GROUP               93
-# define SSL_CTRL_SET_SIGALGS                    97
-# define SSL_CTRL_SET_SIGALGS_LIST               98
-# define SSL_CTRL_CERT_FLAGS                     99
-# define SSL_CTRL_CLEAR_CERT_FLAGS               100
-# define SSL_CTRL_SET_CLIENT_SIGALGS             101
-# define SSL_CTRL_SET_CLIENT_SIGALGS_LIST        102
-# define SSL_CTRL_GET_CLIENT_CERT_TYPES          103
-# define SSL_CTRL_SET_CLIENT_CERT_TYPES          104
-# define SSL_CTRL_BUILD_CERT_CHAIN               105
-# define SSL_CTRL_SET_VERIFY_CERT_STORE          106
-# define SSL_CTRL_SET_CHAIN_CERT_STORE           107
-# define SSL_CTRL_GET_PEER_SIGNATURE_NID         108
-# define SSL_CTRL_GET_PEER_TMP_KEY               109
-# define SSL_CTRL_GET_RAW_CIPHERLIST             110
-# define SSL_CTRL_GET_EC_POINT_FORMATS           111
-# define SSL_CTRL_GET_CHAIN_CERTS                115
-# define SSL_CTRL_SELECT_CURRENT_CERT            116
-# define SSL_CTRL_SET_CURRENT_CERT               117
-# define SSL_CTRL_SET_DH_AUTO                    118
-# define DTLS_CTRL_SET_LINK_MTU                  120
-# define DTLS_CTRL_GET_LINK_MIN_MTU              121
-# define SSL_CTRL_GET_EXTMS_SUPPORT              122
-# define SSL_CTRL_SET_MIN_PROTO_VERSION          123
-# define SSL_CTRL_SET_MAX_PROTO_VERSION          124
-# define SSL_CTRL_SET_SPLIT_SEND_FRAGMENT        125
-# define SSL_CTRL_SET_MAX_PIPELINES              126
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE     127
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB       128
-# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG   129
-# define SSL_CTRL_GET_MIN_PROTO_VERSION          130
-# define SSL_CTRL_GET_MAX_PROTO_VERSION          131
-# define SSL_CTRL_GET_SIGNATURE_NID              132
-# define SSL_CTRL_GET_TMP_KEY                    133
-# define SSL_CTRL_GET_NEGOTIATED_GROUP           134
-# define SSL_CTRL_GET_IANA_GROUPS                135
-# define SSL_CTRL_SET_RETRY_VERIFY               136
-# define SSL_CTRL_GET_VERIFY_CERT_STORE          137
-# define SSL_CTRL_GET_CHAIN_CERT_STORE           138
-# define SSL_CTRL_GET0_IMPLEMENTED_GROUPS        139
-# define SSL_CTRL_GET_SIGNATURE_NAME             140
-# define SSL_CTRL_GET_PEER_SIGNATURE_NAME        141
-# define SSL_CERT_SET_FIRST                      1
-# define SSL_CERT_SET_NEXT                       2
-# define SSL_CERT_SET_SERVER                     3
-# define DTLSv1_get_timeout(ssl, arg) \
-        SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)(arg))
-# define DTLSv1_handle_timeout(ssl) \
-        SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
-# define SSL_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_clear_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_total_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_CTX_set_tmp_dh(ctx,dh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)(dh))
-# endif
-# define SSL_CTX_set_dh_auto(ctx, onoff) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_DH_AUTO,onoff,NULL)
-# define SSL_set_dh_auto(s, onoff) \
-        SSL_ctrl(s,SSL_CTRL_SET_DH_AUTO,onoff,NULL)
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_set_tmp_dh(ssl,dh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)(dh))
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)(ecdh))
-#  define SSL_set_tmp_ecdh(ssl,ecdh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)(ecdh))
-# endif
-# define SSL_CTX_add_extra_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)(x509))
-# define SSL_CTX_get_extra_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,0,px509)
-# define SSL_CTX_get_extra_chain_certs_only(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,1,px509)
-# define SSL_CTX_clear_extra_chain_certs(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
-# define SSL_CTX_set0_chain(ctx,sk) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN,0,(char *)(sk))
-# define SSL_CTX_set1_chain(ctx,sk) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN,1,(char *)(sk))
-# define SSL_CTX_add0_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN_CERT,0,(char *)(x509))
-# define SSL_CTX_add1_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CHAIN_CERT,1,(char *)(x509))
-# define SSL_CTX_get0_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_CTX_clear_chain_certs(ctx) \
-        SSL_CTX_set0_chain(ctx,NULL)
-# define SSL_CTX_build_cert_chain(ctx, flags) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_CTX_select_current_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509))
-# define SSL_CTX_set_current_cert(ctx, op) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
-# define SSL_CTX_set0_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
-# define SSL_CTX_set1_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
-# define SSL_CTX_get0_verify_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
-# define SSL_CTX_set0_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
-# define SSL_CTX_set1_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
-# define SSL_CTX_get0_chain_cert_store(ctx,st) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
-# define SSL_set0_chain(s,sk) \
-        SSL_ctrl(s,SSL_CTRL_CHAIN,0,(char *)(sk))
-# define SSL_set1_chain(s,sk) \
-        SSL_ctrl(s,SSL_CTRL_CHAIN,1,(char *)(sk))
-# define SSL_add0_chain_cert(s,x509) \
-        SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,0,(char *)(x509))
-# define SSL_add1_chain_cert(s,x509) \
-        SSL_ctrl(s,SSL_CTRL_CHAIN_CERT,1,(char *)(x509))
-# define SSL_get0_chain_certs(s,px509) \
-        SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERTS,0,px509)
-# define SSL_clear_chain_certs(s) \
-        SSL_set0_chain(s,NULL)
-# define SSL_build_cert_chain(s, flags) \
-        SSL_ctrl(s,SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
-# define SSL_select_current_cert(s,x509) \
-        SSL_ctrl(s,SSL_CTRL_SELECT_CURRENT_CERT,0,(char *)(x509))
-# define SSL_set_current_cert(s,op) \
-        SSL_ctrl(s,SSL_CTRL_SET_CURRENT_CERT, op, NULL)
-# define SSL_set0_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,0,(char *)(st))
-# define SSL_set1_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_VERIFY_CERT_STORE,1,(char *)(st))
-#define SSL_get0_verify_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_GET_VERIFY_CERT_STORE,0,(char *)(st))
-# define SSL_set0_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,0,(char *)(st))
-# define SSL_set1_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_SET_CHAIN_CERT_STORE,1,(char *)(st))
-#define SSL_get0_chain_cert_store(s,st) \
-        SSL_ctrl(s,SSL_CTRL_GET_CHAIN_CERT_STORE,0,(char *)(st))
+#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB 63
+#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG 64
+#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE 65
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS 66
+#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS 67
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS 68
+#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS 69
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP 70
+#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP 71
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 72
+#endif
+#define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB 75
+#define SSL_CTRL_SET_SRP_VERIFY_PARAM_CB 76
+#define SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB 77
+#define SSL_CTRL_SET_SRP_ARG 78
+#define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME 79
+#define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH 80
+#define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD 81
+#define DTLS_CTRL_GET_TIMEOUT 73
+#define DTLS_CTRL_HANDLE_TIMEOUT 74
+#define SSL_CTRL_GET_RI_SUPPORT 76
+#define SSL_CTRL_CLEAR_MODE 78
+#define SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB 79
+#define SSL_CTRL_GET_EXTRA_CHAIN_CERTS 82
+#define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS 83
+#define SSL_CTRL_CHAIN 88
+#define SSL_CTRL_CHAIN_CERT 89
+#define SSL_CTRL_GET_GROUPS 90
+#define SSL_CTRL_SET_GROUPS 91
+#define SSL_CTRL_SET_GROUPS_LIST 92
+#define SSL_CTRL_GET_SHARED_GROUP 93
+#define SSL_CTRL_SET_SIGALGS 97
+#define SSL_CTRL_SET_SIGALGS_LIST 98
+#define SSL_CTRL_CERT_FLAGS 99
+#define SSL_CTRL_CLEAR_CERT_FLAGS 100
+#define SSL_CTRL_SET_CLIENT_SIGALGS 101
+#define SSL_CTRL_SET_CLIENT_SIGALGS_LIST 102
+#define SSL_CTRL_GET_CLIENT_CERT_TYPES 103
+#define SSL_CTRL_SET_CLIENT_CERT_TYPES 104
+#define SSL_CTRL_BUILD_CERT_CHAIN 105
+#define SSL_CTRL_SET_VERIFY_CERT_STORE 106
+#define SSL_CTRL_SET_CHAIN_CERT_STORE 107
+#define SSL_CTRL_GET_PEER_SIGNATURE_NID 108
+#define SSL_CTRL_GET_PEER_TMP_KEY 109
+#define SSL_CTRL_GET_RAW_CIPHERLIST 110
+#define SSL_CTRL_GET_EC_POINT_FORMATS 111
+#define SSL_CTRL_GET_CHAIN_CERTS 115
+#define SSL_CTRL_SELECT_CURRENT_CERT 116
+#define SSL_CTRL_SET_CURRENT_CERT 117
+#define SSL_CTRL_SET_DH_AUTO 118
+#define DTLS_CTRL_SET_LINK_MTU 120
+#define DTLS_CTRL_GET_LINK_MIN_MTU 121
+#define SSL_CTRL_GET_EXTMS_SUPPORT 122
+#define SSL_CTRL_SET_MIN_PROTO_VERSION 123
+#define SSL_CTRL_SET_MAX_PROTO_VERSION 124
+#define SSL_CTRL_SET_SPLIT_SEND_FRAGMENT 125
+#define SSL_CTRL_SET_MAX_PIPELINES 126
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE 127
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB 128
+#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG 129
+#define SSL_CTRL_GET_MIN_PROTO_VERSION 130
+#define SSL_CTRL_GET_MAX_PROTO_VERSION 131
+#define SSL_CTRL_GET_SIGNATURE_NID 132
+#define SSL_CTRL_GET_TMP_KEY 133
+#define SSL_CTRL_GET_NEGOTIATED_GROUP 134
+#define SSL_CTRL_GET_IANA_GROUPS 135
+#define SSL_CTRL_SET_RETRY_VERIFY 136
+#define SSL_CTRL_GET_VERIFY_CERT_STORE 137
+#define SSL_CTRL_GET_CHAIN_CERT_STORE 138
+#define SSL_CTRL_GET0_IMPLEMENTED_GROUPS 139
+#define SSL_CTRL_GET_SIGNATURE_NAME 140
+#define SSL_CTRL_GET_PEER_SIGNATURE_NAME 141
+#define SSL_CERT_SET_FIRST 1
+#define SSL_CERT_SET_NEXT 2
+#define SSL_CERT_SET_SERVER 3
+#define DTLSv1_get_timeout(ssl, arg) \
+    SSL_ctrl(ssl, DTLS_CTRL_GET_TIMEOUT, 0, (void *)(arg))
+#define DTLSv1_handle_timeout(ssl) \
+    SSL_ctrl(ssl, DTLS_CTRL_HANDLE_TIMEOUT, 0, NULL)
+#define SSL_num_renegotiations(ssl) \
+    SSL_ctrl((ssl), SSL_CTRL_GET_NUM_RENEGOTIATIONS, 0, NULL)
+#define SSL_clear_num_renegotiations(ssl) \
+    SSL_ctrl((ssl), SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS, 0, NULL)
+#define SSL_total_renegotiations(ssl) \
+    SSL_ctrl((ssl), SSL_CTRL_GET_TOTAL_RENEGOTIATIONS, 0, NULL)
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_CTX_set_tmp_dh(ctx, dh) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_DH, 0, (char *)(dh))
+#endif
+#define SSL_CTX_set_dh_auto(ctx, onoff) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_DH_AUTO, onoff, NULL)
+#define SSL_set_dh_auto(s, onoff) \
+    SSL_ctrl(s, SSL_CTRL_SET_DH_AUTO, onoff, NULL)
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_set_tmp_dh(ssl, dh) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TMP_DH, 0, (char *)(dh))
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_CTX_set_tmp_ecdh(ctx, ecdh) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_ECDH, 0, (char *)(ecdh))
+#define SSL_set_tmp_ecdh(ssl, ecdh) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TMP_ECDH, 0, (char *)(ecdh))
+#endif
+#define SSL_CTX_add_extra_chain_cert(ctx, x509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, (char *)(x509))
+#define SSL_CTX_get_extra_chain_certs(ctx, px509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_EXTRA_CHAIN_CERTS, 0, px509)
+#define SSL_CTX_get_extra_chain_certs_only(ctx, px509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_EXTRA_CHAIN_CERTS, 1, px509)
+#define SSL_CTX_clear_extra_chain_certs(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS, 0, NULL)
+#define SSL_CTX_set0_chain(ctx, sk) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_CHAIN, 0, (char *)(sk))
+#define SSL_CTX_set1_chain(ctx, sk) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_CHAIN, 1, (char *)(sk))
+#define SSL_CTX_add0_chain_cert(ctx, x509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_CHAIN_CERT, 0, (char *)(x509))
+#define SSL_CTX_add1_chain_cert(ctx, x509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_CHAIN_CERT, 1, (char *)(x509))
+#define SSL_CTX_get0_chain_certs(ctx, px509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_CHAIN_CERTS, 0, px509)
+#define SSL_CTX_clear_chain_certs(ctx) \
+    SSL_CTX_set0_chain(ctx, NULL)
+#define SSL_CTX_build_cert_chain(ctx, flags) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
+#define SSL_CTX_select_current_cert(ctx, x509) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SELECT_CURRENT_CERT, 0, (char *)(x509))
+#define SSL_CTX_set_current_cert(ctx, op) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_CURRENT_CERT, op, NULL)
+#define SSL_CTX_set0_verify_cert_store(ctx, st) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_VERIFY_CERT_STORE, 0, (char *)(st))
+#define SSL_CTX_set1_verify_cert_store(ctx, st) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_VERIFY_CERT_STORE, 1, (char *)(st))
+#define SSL_CTX_get0_verify_cert_store(ctx, st) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_VERIFY_CERT_STORE, 0, (char *)(st))
+#define SSL_CTX_set0_chain_cert_store(ctx, st) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_CHAIN_CERT_STORE, 0, (char *)(st))
+#define SSL_CTX_set1_chain_cert_store(ctx, st) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_CHAIN_CERT_STORE, 1, (char *)(st))
+#define SSL_CTX_get0_chain_cert_store(ctx, st) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_CHAIN_CERT_STORE, 0, (char *)(st))
+#define SSL_set0_chain(s, sk) \
+    SSL_ctrl(s, SSL_CTRL_CHAIN, 0, (char *)(sk))
+#define SSL_set1_chain(s, sk) \
+    SSL_ctrl(s, SSL_CTRL_CHAIN, 1, (char *)(sk))
+#define SSL_add0_chain_cert(s, x509) \
+    SSL_ctrl(s, SSL_CTRL_CHAIN_CERT, 0, (char *)(x509))
+#define SSL_add1_chain_cert(s, x509) \
+    SSL_ctrl(s, SSL_CTRL_CHAIN_CERT, 1, (char *)(x509))
+#define SSL_get0_chain_certs(s, px509) \
+    SSL_ctrl(s, SSL_CTRL_GET_CHAIN_CERTS, 0, px509)
+#define SSL_clear_chain_certs(s) \
+    SSL_set0_chain(s, NULL)
+#define SSL_build_cert_chain(s, flags) \
+    SSL_ctrl(s, SSL_CTRL_BUILD_CERT_CHAIN, flags, NULL)
+#define SSL_select_current_cert(s, x509) \
+    SSL_ctrl(s, SSL_CTRL_SELECT_CURRENT_CERT, 0, (char *)(x509))
+#define SSL_set_current_cert(s, op) \
+    SSL_ctrl(s, SSL_CTRL_SET_CURRENT_CERT, op, NULL)
+#define SSL_set0_verify_cert_store(s, st) \
+    SSL_ctrl(s, SSL_CTRL_SET_VERIFY_CERT_STORE, 0, (char *)(st))
+#define SSL_set1_verify_cert_store(s, st) \
+    SSL_ctrl(s, SSL_CTRL_SET_VERIFY_CERT_STORE, 1, (char *)(st))
+#define SSL_get0_verify_cert_store(s, st) \
+    SSL_ctrl(s, SSL_CTRL_GET_VERIFY_CERT_STORE, 0, (char *)(st))
+#define SSL_set0_chain_cert_store(s, st) \
+    SSL_ctrl(s, SSL_CTRL_SET_CHAIN_CERT_STORE, 0, (char *)(st))
+#define SSL_set1_chain_cert_store(s, st) \
+    SSL_ctrl(s, SSL_CTRL_SET_CHAIN_CERT_STORE, 1, (char *)(st))
+#define SSL_get0_chain_cert_store(s, st) \
+    SSL_ctrl(s, SSL_CTRL_GET_CHAIN_CERT_STORE, 0, (char *)(st))
 
-# define SSL_get1_groups(s, glist) \
-        SSL_ctrl(s,SSL_CTRL_GET_GROUPS,0,(int*)(glist))
-# define SSL_get0_iana_groups(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_IANA_GROUPS,0,(uint16_t **)(plst))
-# define SSL_CTX_set1_groups(ctx, glist, glistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS,glistlen,(int *)(glist))
-# define SSL_CTX_set1_groups_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(s))
-# define SSL_CTX_get0_implemented_groups(ctx, all, out) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET0_IMPLEMENTED_GROUPS, all, \
+#define SSL_get1_groups(s, glist) \
+    SSL_ctrl(s, SSL_CTRL_GET_GROUPS, 0, (int *)(glist))
+#define SSL_get0_iana_groups(s, plst) \
+    SSL_ctrl(s, SSL_CTRL_GET_IANA_GROUPS, 0, (uint16_t **)(plst))
+#define SSL_CTX_set1_groups(ctx, glist, glistlen) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_GROUPS, glistlen, (int *)(glist))
+#define SSL_CTX_set1_groups_list(ctx, s) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_GROUPS_LIST, 0, (char *)(s))
+#define SSL_CTX_get0_implemented_groups(ctx, all, out)       \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET0_IMPLEMENTED_GROUPS, all, \
         (STACK_OF(OPENSSL_CSTRING) *)(out))
-# define SSL_set1_groups(s, glist, glistlen) \
-        SSL_ctrl(s,SSL_CTRL_SET_GROUPS,glistlen,(char *)(glist))
-# define SSL_set1_groups_list(s, str) \
-        SSL_ctrl(s,SSL_CTRL_SET_GROUPS_LIST,0,(char *)(str))
-# define SSL_get_shared_group(s, n) \
-        SSL_ctrl(s,SSL_CTRL_GET_SHARED_GROUP,n,NULL)
-# define SSL_get_negotiated_group(s) \
-        SSL_ctrl(s,SSL_CTRL_GET_NEGOTIATED_GROUP,0,NULL)
-# define SSL_CTX_set1_sigalgs(ctx, slist, slistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS,slistlen,(int *)(slist))
-# define SSL_CTX_set1_sigalgs_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)(s))
-# define SSL_set1_sigalgs(s, slist, slistlen) \
-        SSL_ctrl(s,SSL_CTRL_SET_SIGALGS,slistlen,(int *)(slist))
-# define SSL_set1_sigalgs_list(s, str) \
-        SSL_ctrl(s,SSL_CTRL_SET_SIGALGS_LIST,0,(char *)(str))
-# define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS,slistlen,(int *)(slist))
-# define SSL_CTX_set1_client_sigalgs_list(ctx, s) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)(s))
-# define SSL_set1_client_sigalgs(s, slist, slistlen) \
-        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_SIGALGS,slistlen,(int *)(slist))
-# define SSL_set1_client_sigalgs_list(s, str) \
-        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_SIGALGS_LIST,0,(char *)(str))
-# define SSL_get0_certificate_types(s, clist) \
-        SSL_ctrl(s, SSL_CTRL_GET_CLIENT_CERT_TYPES, 0, (char *)(clist))
-# define SSL_CTX_set1_client_certificate_types(ctx, clist, clistlen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_CLIENT_CERT_TYPES,clistlen, \
-                     (char *)(clist))
-# define SSL_set1_client_certificate_types(s, clist, clistlen) \
-        SSL_ctrl(s,SSL_CTRL_SET_CLIENT_CERT_TYPES,clistlen,(char *)(clist))
-# define SSL_get0_signature_name(s, str) \
-        SSL_ctrl(s,SSL_CTRL_GET_SIGNATURE_NAME,0,(1?(str):(const char **)NULL))
-# define SSL_get_signature_nid(s, pn) \
-        SSL_ctrl(s,SSL_CTRL_GET_SIGNATURE_NID,0,pn)
-# define SSL_get0_peer_signature_name(s, str) \
-        SSL_ctrl(s,SSL_CTRL_GET_PEER_SIGNATURE_NAME,0,(1?(str):(const char **)NULL))
-# define SSL_get_peer_signature_nid(s, pn) \
-        SSL_ctrl(s,SSL_CTRL_GET_PEER_SIGNATURE_NID,0,pn)
-# define SSL_get_peer_tmp_key(s, pk) \
-        SSL_ctrl(s,SSL_CTRL_GET_PEER_TMP_KEY,0,pk)
-# define SSL_get_tmp_key(s, pk) \
-        SSL_ctrl(s,SSL_CTRL_GET_TMP_KEY,0,pk)
-# define SSL_get0_raw_cipherlist(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_RAW_CIPHERLIST,0,plst)
-# define SSL_get0_ec_point_formats(s, plst) \
-        SSL_ctrl(s,SSL_CTRL_GET_EC_POINT_FORMATS,0,plst)
-# define SSL_CTX_set_min_proto_version(ctx, version) \
-        SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
-# define SSL_CTX_set_max_proto_version(ctx, version) \
-        SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
-# define SSL_CTX_get_min_proto_version(ctx) \
-        SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL)
-# define SSL_CTX_get_max_proto_version(ctx) \
-        SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL)
-# define SSL_set_min_proto_version(s, version) \
-        SSL_ctrl(s, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
-# define SSL_set_max_proto_version(s, version) \
-        SSL_ctrl(s, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
-# define SSL_get_min_proto_version(s) \
-        SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL)
-# define SSL_get_max_proto_version(s) \
-        SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL)
+#define SSL_set1_groups(s, glist, glistlen) \
+    SSL_ctrl(s, SSL_CTRL_SET_GROUPS, glistlen, (char *)(glist))
+#define SSL_set1_groups_list(s, str) \
+    SSL_ctrl(s, SSL_CTRL_SET_GROUPS_LIST, 0, (char *)(str))
+#define SSL_get_shared_group(s, n) \
+    SSL_ctrl(s, SSL_CTRL_GET_SHARED_GROUP, n, NULL)
+#define SSL_get_negotiated_group(s) \
+    SSL_ctrl(s, SSL_CTRL_GET_NEGOTIATED_GROUP, 0, NULL)
+#define SSL_CTX_set1_sigalgs(ctx, slist, slistlen) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SIGALGS, slistlen, (int *)(slist))
+#define SSL_CTX_set1_sigalgs_list(ctx, s) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SIGALGS_LIST, 0, (char *)(s))
+#define SSL_set1_sigalgs(s, slist, slistlen) \
+    SSL_ctrl(s, SSL_CTRL_SET_SIGALGS, slistlen, (int *)(slist))
+#define SSL_set1_sigalgs_list(s, str) \
+    SSL_ctrl(s, SSL_CTRL_SET_SIGALGS_LIST, 0, (char *)(str))
+#define SSL_CTX_set1_client_sigalgs(ctx, slist, slistlen) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_CLIENT_SIGALGS, slistlen, (int *)(slist))
+#define SSL_CTX_set1_client_sigalgs_list(ctx, s) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_CLIENT_SIGALGS_LIST, 0, (char *)(s))
+#define SSL_set1_client_sigalgs(s, slist, slistlen) \
+    SSL_ctrl(s, SSL_CTRL_SET_CLIENT_SIGALGS, slistlen, (int *)(slist))
+#define SSL_set1_client_sigalgs_list(s, str) \
+    SSL_ctrl(s, SSL_CTRL_SET_CLIENT_SIGALGS_LIST, 0, (char *)(str))
+#define SSL_get0_certificate_types(s, clist) \
+    SSL_ctrl(s, SSL_CTRL_GET_CLIENT_CERT_TYPES, 0, (char *)(clist))
+#define SSL_CTX_set1_client_certificate_types(ctx, clist, clistlen) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_CLIENT_CERT_TYPES, clistlen,     \
+        (char *)(clist))
+#define SSL_set1_client_certificate_types(s, clist, clistlen) \
+    SSL_ctrl(s, SSL_CTRL_SET_CLIENT_CERT_TYPES, clistlen, (char *)(clist))
+#define SSL_get0_signature_name(s, str) \
+    SSL_ctrl(s, SSL_CTRL_GET_SIGNATURE_NAME, 0, (1 ? (str) : (const char **)NULL))
+#define SSL_get_signature_nid(s, pn) \
+    SSL_ctrl(s, SSL_CTRL_GET_SIGNATURE_NID, 0, pn)
+#define SSL_get0_peer_signature_name(s, str) \
+    SSL_ctrl(s, SSL_CTRL_GET_PEER_SIGNATURE_NAME, 0, (1 ? (str) : (const char **)NULL))
+#define SSL_get_peer_signature_nid(s, pn) \
+    SSL_ctrl(s, SSL_CTRL_GET_PEER_SIGNATURE_NID, 0, pn)
+#define SSL_get_peer_tmp_key(s, pk) \
+    SSL_ctrl(s, SSL_CTRL_GET_PEER_TMP_KEY, 0, pk)
+#define SSL_get_tmp_key(s, pk) \
+    SSL_ctrl(s, SSL_CTRL_GET_TMP_KEY, 0, pk)
+#define SSL_get0_raw_cipherlist(s, plst) \
+    SSL_ctrl(s, SSL_CTRL_GET_RAW_CIPHERLIST, 0, plst)
+#define SSL_get0_ec_point_formats(s, plst) \
+    SSL_ctrl(s, SSL_CTRL_GET_EC_POINT_FORMATS, 0, plst)
+#define SSL_CTX_set_min_proto_version(ctx, version) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
+#define SSL_CTX_set_max_proto_version(ctx, version) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
+#define SSL_CTX_get_min_proto_version(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL)
+#define SSL_CTX_get_max_proto_version(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL)
+#define SSL_set_min_proto_version(s, version) \
+    SSL_ctrl(s, SSL_CTRL_SET_MIN_PROTO_VERSION, version, NULL)
+#define SSL_set_max_proto_version(s, version) \
+    SSL_ctrl(s, SSL_CTRL_SET_MAX_PROTO_VERSION, version, NULL)
+#define SSL_get_min_proto_version(s) \
+    SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, NULL)
+#define SSL_get_max_proto_version(s) \
+    SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, NULL)
 
 const char *SSL_get0_group_name(SSL *s);
 const char *SSL_group_to_name(SSL *s, int id);
 
 /* Backwards compatibility, original 1.1.0 names */
-# define SSL_CTRL_GET_SERVER_TMP_KEY \
-         SSL_CTRL_GET_PEER_TMP_KEY
-# define SSL_get_server_tmp_key(s, pk) \
-         SSL_get_peer_tmp_key(s, pk)
+#define SSL_CTRL_GET_SERVER_TMP_KEY \
+    SSL_CTRL_GET_PEER_TMP_KEY
+#define SSL_get_server_tmp_key(s, pk) \
+    SSL_get_peer_tmp_key(s, pk)
 
 int SSL_set0_tmp_dh_pkey(SSL *s, EVP_PKEY *dhpkey);
 int SSL_CTX_set0_tmp_dh_pkey(SSL_CTX *ctx, EVP_PKEY *dhpkey);
@@ -1530,34 +1534,37 @@ int SSL_CTX_set0_tmp_dh_pkey(SSL_CTX *ctx, EVP_PKEY *dhpkey);
  * The following symbol names are old and obsolete. They are kept
  * for compatibility reasons only and should not be used anymore.
  */
-# define SSL_CTRL_GET_CURVES           SSL_CTRL_GET_GROUPS
-# define SSL_CTRL_SET_CURVES           SSL_CTRL_SET_GROUPS
-# define SSL_CTRL_SET_CURVES_LIST      SSL_CTRL_SET_GROUPS_LIST
-# define SSL_CTRL_GET_SHARED_CURVE     SSL_CTRL_GET_SHARED_GROUP
+#define SSL_CTRL_GET_CURVES SSL_CTRL_GET_GROUPS
+#define SSL_CTRL_SET_CURVES SSL_CTRL_SET_GROUPS
+#define SSL_CTRL_SET_CURVES_LIST SSL_CTRL_SET_GROUPS_LIST
+#define SSL_CTRL_GET_SHARED_CURVE SSL_CTRL_GET_SHARED_GROUP
 
-# define SSL_get1_curves               SSL_get1_groups
-# define SSL_CTX_set1_curves           SSL_CTX_set1_groups
-# define SSL_CTX_set1_curves_list      SSL_CTX_set1_groups_list
-# define SSL_set1_curves               SSL_set1_groups
-# define SSL_set1_curves_list          SSL_set1_groups_list
-# define SSL_get_shared_curve          SSL_get_shared_group
+#define SSL_get1_curves SSL_get1_groups
+#define SSL_CTX_set1_curves SSL_CTX_set1_groups
+#define SSL_CTX_set1_curves_list SSL_CTX_set1_groups_list
+#define SSL_set1_curves SSL_set1_groups
+#define SSL_set1_curves_list SSL_set1_groups_list
+#define SSL_get_shared_curve SSL_get_shared_group
 
-
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /* Provide some compatibility macros for removed functionality. */
-#  define SSL_CTX_need_tmp_RSA(ctx)                0
-#  define SSL_CTX_set_tmp_rsa(ctx,rsa)             1
-#  define SSL_need_tmp_RSA(ssl)                    0
-#  define SSL_set_tmp_rsa(ssl,rsa)                 1
-#  define SSL_CTX_set_ecdh_auto(dummy, onoff)      ((onoff) != 0)
-#  define SSL_set_ecdh_auto(dummy, onoff)          ((onoff) != 0)
+#define SSL_CTX_need_tmp_RSA(ctx) 0
+#define SSL_CTX_set_tmp_rsa(ctx, rsa) 1
+#define SSL_need_tmp_RSA(ssl) 0
+#define SSL_set_tmp_rsa(ssl, rsa) 1
+#define SSL_CTX_set_ecdh_auto(dummy, onoff) ((onoff) != 0)
+#define SSL_set_ecdh_auto(dummy, onoff) ((onoff) != 0)
 /*
  * We "pretend" to call the callback to avoid warnings about unused static
  * functions.
  */
-#  define SSL_CTX_set_tmp_rsa_callback(ctx, cb)    while(0) (cb)(NULL, 0, 0)
-#  define SSL_set_tmp_rsa_callback(ssl, cb)        while(0) (cb)(NULL, 0, 0)
-# endif
+#define SSL_CTX_set_tmp_rsa_callback(ctx, cb) \
+    while (0)                                 \
+    (cb)(NULL, 0, 0)
+#define SSL_set_tmp_rsa_callback(ssl, cb) \
+    while (0)                             \
+    (cb)(NULL, 0, 0)
+#endif
 __owur const BIO_METHOD *BIO_f_ssl(void);
 __owur BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
 __owur BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
@@ -1568,7 +1575,7 @@ void BIO_ssl_shutdown(BIO *ssl_bio);
 __owur int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
 __owur SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
 __owur SSL_CTX *SSL_CTX_new_ex(OSSL_LIB_CTX *libctx, const char *propq,
-                               const SSL_METHOD *meth);
+    const SSL_METHOD *meth);
 int SSL_CTX_up_ref(SSL_CTX *ctx);
 void SSL_CTX_free(SSL_CTX *);
 __owur long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
@@ -1607,11 +1614,11 @@ __owur char *SSL_get_shared_ciphers(const SSL *s, char *buf, int size);
 __owur int SSL_get_read_ahead(const SSL *s);
 __owur int SSL_pending(const SSL *s);
 __owur int SSL_has_pending(const SSL *s);
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 __owur int SSL_set_fd(SSL *s, int fd);
 __owur int SSL_set_rfd(SSL *s, int fd);
 __owur int SSL_set_wfd(SSL *s, int fd);
-# endif
+#endif
 void SSL_set0_rbio(SSL *s, BIO *rbio);
 void SSL_set0_wbio(SSL *s, BIO *wbio);
 void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio);
@@ -1626,32 +1633,31 @@ __owur int SSL_get_verify_depth(const SSL *s);
 __owur SSL_verify_cb SSL_get_verify_callback(const SSL *s);
 void SSL_set_verify(SSL *s, int mode, SSL_verify_cb callback);
 void SSL_set_verify_depth(SSL *s, int depth);
-void SSL_set_cert_cb(SSL *s, int (*cb) (SSL *ssl, void *arg), void *arg);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+void SSL_set_cert_cb(SSL *s, int (*cb)(SSL *ssl, void *arg), void *arg);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 __owur int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
 __owur int SSL_use_RSAPrivateKey_ASN1(SSL *ssl,
-                                      const unsigned char *d, long len);
-# endif
+    const unsigned char *d, long len);
+#endif
 __owur int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
 __owur int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
-                                   long len);
+    long len);
 __owur int SSL_use_certificate(SSL *ssl, X509 *x);
 __owur int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
 __owur int SSL_use_cert_and_key(SSL *ssl, X509 *x509, EVP_PKEY *privatekey,
-                                STACK_OF(X509) *chain, int override);
-
+    STACK_OF(X509) *chain, int override);
 
 /* serverinfo file format versions */
-# define SSL_SERVERINFOV1   1
-# define SSL_SERVERINFOV2   2
+#define SSL_SERVERINFOV1 1
+#define SSL_SERVERINFOV2 2
 
 /* Set serverinfo data for the current active cert. */
 __owur int SSL_CTX_use_serverinfo(SSL_CTX *ctx, const unsigned char *serverinfo,
-                                  size_t serverinfo_length);
+    size_t serverinfo_length);
 __owur int SSL_CTX_use_serverinfo_ex(SSL_CTX *ctx, unsigned int version,
-                                     const unsigned char *serverinfo,
-                                     size_t serverinfo_length);
+    const unsigned char *serverinfo,
+    size_t serverinfo_length);
 __owur int SSL_CTX_use_serverinfo_file(SSL_CTX *ctx, const char *file);
 
 #ifndef OPENSSL_NO_DEPRECATED_3_0
@@ -1665,31 +1671,31 @@ __owur int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 __owur int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file,
-                                          int type);
+    int type);
 #endif
 __owur int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file,
-                                       int type);
+    int type);
 __owur int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file,
-                                        int type);
+    int type);
 /* PEM type */
 __owur int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
 __owur int SSL_use_certificate_chain_file(SSL *ssl, const char *file);
 __owur STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-__owur STACK_OF(X509_NAME)
-*SSL_load_client_CA_file_ex(const char *file, OSSL_LIB_CTX *libctx,
-                            const char *propq);
+__owur STACK_OF(X509_NAME) *SSL_load_client_CA_file_ex(const char *file, OSSL_LIB_CTX *libctx,
+    const char *propq);
 __owur int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                               const char *file);
+    const char *file);
 int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                       const char *dir);
+    const char *dir);
 int SSL_add_store_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                       const char *uri);
+    const char *uri);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define SSL_load_error_strings() \
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define SSL_load_error_strings()                   \
     OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
-                     | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-# endif
+            | OPENSSL_INIT_LOAD_CRYPTO_STRINGS,    \
+        NULL)
+#endif
 
 __owur const char *SSL_state_string(const SSL *s);
 __owur const char *SSL_rstate_string(const SSL *s);
@@ -1713,39 +1719,39 @@ __owur time_t SSL_SESSION_set_time_ex(SSL_SESSION *s, time_t t);
 __owur const char *SSL_SESSION_get0_hostname(const SSL_SESSION *s);
 __owur int SSL_SESSION_set1_hostname(SSL_SESSION *s, const char *hostname);
 void SSL_SESSION_get0_alpn_selected(const SSL_SESSION *s,
-                                    const unsigned char **alpn,
-                                    size_t *len);
+    const unsigned char **alpn,
+    size_t *len);
 __owur int SSL_SESSION_set1_alpn_selected(SSL_SESSION *s,
-                                          const unsigned char *alpn,
-                                          size_t len);
+    const unsigned char *alpn,
+    size_t len);
 __owur const SSL_CIPHER *SSL_SESSION_get0_cipher(const SSL_SESSION *s);
 __owur int SSL_SESSION_set_cipher(SSL_SESSION *s, const SSL_CIPHER *cipher);
 __owur int SSL_SESSION_has_ticket(const SSL_SESSION *s);
 __owur unsigned long SSL_SESSION_get_ticket_lifetime_hint(const SSL_SESSION *s);
 void SSL_SESSION_get0_ticket(const SSL_SESSION *s, const unsigned char **tick,
-                             size_t *len);
+    size_t *len);
 __owur uint32_t SSL_SESSION_get_max_early_data(const SSL_SESSION *s);
 __owur int SSL_SESSION_set_max_early_data(SSL_SESSION *s,
-                                          uint32_t max_early_data);
+    uint32_t max_early_data);
 __owur int SSL_copy_session_id(SSL *to, const SSL *from);
 __owur X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
 __owur int SSL_SESSION_set1_id_context(SSL_SESSION *s,
-                                       const unsigned char *sid_ctx,
-                                       unsigned int sid_ctx_len);
+    const unsigned char *sid_ctx,
+    unsigned int sid_ctx_len);
 __owur int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,
-                               unsigned int sid_len);
+    unsigned int sid_len);
 __owur int SSL_SESSION_is_resumable(const SSL_SESSION *s);
 
 __owur SSL_SESSION *SSL_SESSION_new(void);
 __owur SSL_SESSION *SSL_SESSION_dup(const SSL_SESSION *src);
 const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
-                                        unsigned int *len);
+    unsigned int *len);
 const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *s,
-                                                 unsigned int *len);
+    unsigned int *len);
 __owur unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
-# endif
+#endif
 int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
 int SSL_SESSION_print_keylog(BIO *bp, const SSL_SESSION *x);
 int SSL_SESSION_up_ref(SSL_SESSION *ses);
@@ -1757,22 +1763,22 @@ int SSL_CTX_remove_session(SSL_CTX *ctx, SSL_SESSION *session);
 __owur int SSL_CTX_set_generate_session_id(SSL_CTX *ctx, GEN_SESSION_CB cb);
 __owur int SSL_set_generate_session_id(SSL *s, GEN_SESSION_CB cb);
 __owur int SSL_has_matching_session_id(const SSL *s,
-                                       const unsigned char *id,
-                                       unsigned int id_len);
+    const unsigned char *id,
+    unsigned int id_len);
 SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-                             long length);
+    long length);
 SSL_SESSION *d2i_SSL_SESSION_ex(SSL_SESSION **a, const unsigned char **pp,
-                                long length, OSSL_LIB_CTX *libctx,
-                                const char *propq);
+    long length, OSSL_LIB_CTX *libctx,
+    const char *propq);
 
-# ifdef OPENSSL_X509_H
+#ifdef OPENSSL_X509_H
 __owur X509 *SSL_get0_peer_certificate(const SSL *s);
 __owur X509 *SSL_get1_peer_certificate(const SSL *s);
 /* Deprecated in 3.0.0 */
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   define SSL_get_peer_certificate SSL_get1_peer_certificate
-#  endif
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_get_peer_certificate SSL_get1_peer_certificate
+#endif
+#endif
 
 __owur STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
 
@@ -1782,25 +1788,25 @@ __owur SSL_verify_cb SSL_CTX_get_verify_callback(const SSL_CTX *ctx);
 void SSL_CTX_set_verify(SSL_CTX *ctx, int mode, SSL_verify_cb callback);
 void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth);
 void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
-                                      int (*cb) (X509_STORE_CTX *, void *),
-                                      void *arg);
-void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb) (SSL *ssl, void *arg),
-                         void *arg);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+    int (*cb)(X509_STORE_CTX *, void *),
+    void *arg);
+void SSL_CTX_set_cert_cb(SSL_CTX *c, int (*cb)(SSL *ssl, void *arg),
+    void *arg);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 __owur int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
 OSSL_DEPRECATEDIN_3_0
 __owur int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
-                                          long len);
-# endif
+    long len);
+#endif
 __owur int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
 __owur int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx,
-                                       const unsigned char *d, long len);
+    const unsigned char *d, long len);
 __owur int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
 __owur int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
-                                        const unsigned char *d);
+    const unsigned char *d);
 __owur int SSL_CTX_use_cert_and_key(SSL_CTX *ctx, X509 *x509, EVP_PKEY *privatekey,
-                                    STACK_OF(X509) *chain, int override);
+    STACK_OF(X509) *chain, int override);
 
 void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
 void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
@@ -1815,8 +1821,8 @@ __owur int SSL_CTX_check_private_key(const SSL_CTX *ctx);
 __owur int SSL_check_private_key(const SSL *ctx);
 
 __owur int SSL_CTX_set_session_id_context(SSL_CTX *ctx,
-                                          const unsigned char *sid_ctx,
-                                          unsigned int sid_ctx_len);
+    const unsigned char *sid_ctx,
+    unsigned int sid_ctx_len);
 
 SSL *SSL_new(SSL_CTX *ctx);
 int SSL_up_ref(SSL *s);
@@ -1824,7 +1830,7 @@ int SSL_is_dtls(const SSL *s);
 int SSL_is_tls(const SSL *s);
 int SSL_is_quic(const SSL *s);
 __owur int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
-                                      unsigned int sid_ctx_len);
+    unsigned int sid_ctx_len);
 
 __owur int SSL_CTX_set_purpose(SSL_CTX *ctx, int purpose);
 __owur int SSL_set_purpose(SSL *ssl, int purpose);
@@ -1838,14 +1844,14 @@ void SSL_set_hostflags(SSL *s, unsigned int flags);
 
 __owur int SSL_CTX_dane_enable(SSL_CTX *ctx);
 __owur int SSL_CTX_dane_mtype_set(SSL_CTX *ctx, const EVP_MD *md,
-                                  uint8_t mtype, uint8_t ord);
+    uint8_t mtype, uint8_t ord);
 __owur int SSL_dane_enable(SSL *s, const char *basedomain);
 __owur int SSL_dane_tlsa_add(SSL *s, uint8_t usage, uint8_t selector,
-                             uint8_t mtype, const unsigned char *data, size_t dlen);
+    uint8_t mtype, const unsigned char *data, size_t dlen);
 __owur int SSL_get0_dane_authority(SSL *s, X509 **mcert, EVP_PKEY **mspki);
 __owur int SSL_get0_dane_tlsa(SSL *s, uint8_t *usage, uint8_t *selector,
-                              uint8_t *mtype, const unsigned char **data,
-                              size_t *dlen);
+    uint8_t *mtype, const unsigned char **data,
+    size_t *dlen);
 /*
  * Bridge opacity barrier between libcrypt and libssl, also needed to support
  * offline testing in test/danetest.c
@@ -1865,52 +1871,52 @@ __owur int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
 __owur X509_VERIFY_PARAM *SSL_CTX_get0_param(SSL_CTX *ctx);
 __owur X509_VERIFY_PARAM *SSL_get0_param(SSL *ssl);
 
-# ifndef OPENSSL_NO_SRP
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_SRP
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name);
 OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_password(SSL_CTX *ctx, char *password);
 OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength);
 OSSL_DEPRECATEDIN_3_0
 int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx,
-                                        char *(*cb) (SSL *, void *));
+    char *(*cb)(SSL *, void *));
 OSSL_DEPRECATEDIN_3_0
 int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx,
-                                          int (*cb) (SSL *, void *));
+    int (*cb)(SSL *, void *));
 OSSL_DEPRECATEDIN_3_0
 int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
-                                      int (*cb) (SSL *, int *, void *));
+    int (*cb)(SSL *, int *, void *));
 OSSL_DEPRECATEDIN_3_0 int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg);
 
 OSSL_DEPRECATEDIN_3_0
 int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
-                             BIGNUM *sa, BIGNUM *v, char *info);
+    BIGNUM *sa, BIGNUM *v, char *info);
 OSSL_DEPRECATEDIN_3_0
 int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
-                                const char *grp);
+    const char *grp);
 
 OSSL_DEPRECATEDIN_3_0 __owur BIGNUM *SSL_get_srp_g(SSL *s);
 OSSL_DEPRECATEDIN_3_0 __owur BIGNUM *SSL_get_srp_N(SSL *s);
 
 OSSL_DEPRECATEDIN_3_0 __owur char *SSL_get_srp_username(SSL *s);
 OSSL_DEPRECATEDIN_3_0 __owur char *SSL_get_srp_userinfo(SSL *s);
-#  endif
-# endif
+#endif
+#endif
 
 /*
  * ClientHello callback and helpers.
  */
 
-# define SSL_CLIENT_HELLO_SUCCESS 1
-# define SSL_CLIENT_HELLO_ERROR   0
-# define SSL_CLIENT_HELLO_RETRY   (-1)
+#define SSL_CLIENT_HELLO_SUCCESS 1
+#define SSL_CLIENT_HELLO_ERROR 0
+#define SSL_CLIENT_HELLO_RETRY (-1)
 
-typedef int (*SSL_client_hello_cb_fn) (SSL *s, int *al, void *arg);
+typedef int (*SSL_client_hello_cb_fn)(SSL *s, int *al, void *arg);
 void SSL_CTX_set_client_hello_cb(SSL_CTX *c, SSL_client_hello_cb_fn cb,
-                                 void *arg);
-typedef int (*SSL_new_pending_conn_cb_fn) (SSL_CTX *ctx, SSL *new_ssl,
-                                           void *arg);
+    void *arg);
+typedef int (*SSL_new_pending_conn_cb_fn)(SSL_CTX *ctx, SSL *new_ssl,
+    void *arg);
 void SSL_CTX_set_new_pending_conn_cb(SSL_CTX *c, SSL_new_pending_conn_cb_fn cb,
-                                     void *arg);
+    void *arg);
 
 int SSL_client_hello_isv2(SSL *s);
 unsigned int SSL_client_hello_get0_legacy_version(SSL *s);
@@ -1918,65 +1924,65 @@ size_t SSL_client_hello_get0_random(SSL *s, const unsigned char **out);
 size_t SSL_client_hello_get0_session_id(SSL *s, const unsigned char **out);
 size_t SSL_client_hello_get0_ciphers(SSL *s, const unsigned char **out);
 size_t SSL_client_hello_get0_compression_methods(SSL *s,
-                                                 const unsigned char **out);
+    const unsigned char **out);
 int SSL_client_hello_get1_extensions_present(SSL *s, int **out, size_t *outlen);
 int SSL_client_hello_get_extension_order(SSL *s, uint16_t *exts,
-                                         size_t *num_exts);
+    size_t *num_exts);
 int SSL_client_hello_get0_ext(SSL *s, unsigned int type,
-                              const unsigned char **out, size_t *outlen);
+    const unsigned char **out, size_t *outlen);
 
 void SSL_certs_clear(SSL *s);
 void SSL_free(SSL *ssl);
-# ifdef OSSL_ASYNC_FD
+#ifdef OSSL_ASYNC_FD
 /*
  * Windows application developer has to include windows.h to use these.
  */
 __owur int SSL_waiting_for_async(SSL *s);
 __owur int SSL_get_all_async_fds(SSL *s, OSSL_ASYNC_FD *fds, size_t *numfds);
 __owur int SSL_get_changed_async_fds(SSL *s, OSSL_ASYNC_FD *addfd,
-                                     size_t *numaddfds, OSSL_ASYNC_FD *delfd,
-                                     size_t *numdelfds);
+    size_t *numaddfds, OSSL_ASYNC_FD *delfd,
+    size_t *numdelfds);
 __owur int SSL_CTX_set_async_callback(SSL_CTX *ctx, SSL_async_callback_fn callback);
 __owur int SSL_CTX_set_async_callback_arg(SSL_CTX *ctx, void *arg);
 __owur int SSL_set_async_callback(SSL *s, SSL_async_callback_fn callback);
 __owur int SSL_set_async_callback_arg(SSL *s, void *arg);
 __owur int SSL_get_async_status(SSL *s, int *status);
 
-# endif
+#endif
 __owur int SSL_accept(SSL *ssl);
 __owur int SSL_stateless(SSL *s);
 __owur int SSL_connect(SSL *ssl);
 __owur int SSL_read(SSL *ssl, void *buf, int num);
 __owur int SSL_read_ex(SSL *ssl, void *buf, size_t num, size_t *readbytes);
 
-# define SSL_READ_EARLY_DATA_ERROR   0
-# define SSL_READ_EARLY_DATA_SUCCESS 1
-# define SSL_READ_EARLY_DATA_FINISH  2
+#define SSL_READ_EARLY_DATA_ERROR 0
+#define SSL_READ_EARLY_DATA_SUCCESS 1
+#define SSL_READ_EARLY_DATA_FINISH 2
 
 __owur int SSL_read_early_data(SSL *s, void *buf, size_t num,
-                               size_t *readbytes);
+    size_t *readbytes);
 __owur int SSL_peek(SSL *ssl, void *buf, int num);
 __owur int SSL_peek_ex(SSL *ssl, void *buf, size_t num, size_t *readbytes);
 __owur ossl_ssize_t SSL_sendfile(SSL *s, int fd, off_t offset, size_t size,
-                                 int flags);
+    int flags);
 __owur int SSL_write(SSL *ssl, const void *buf, int num);
 __owur int SSL_write_ex(SSL *s, const void *buf, size_t num, size_t *written);
 __owur int SSL_write_early_data(SSL *s, const void *buf, size_t num,
-                                size_t *written);
+    size_t *written);
 long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg);
 long SSL_callback_ctrl(SSL *, int, void (*)(void));
 long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
 long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
 
-# define SSL_WRITE_FLAG_CONCLUDE    (1U << 0)
+#define SSL_WRITE_FLAG_CONCLUDE (1U << 0)
 
 __owur int SSL_write_ex2(SSL *s, const void *buf, size_t num,
-                         uint64_t flags,
-                         size_t *written);
+    uint64_t flags,
+    size_t *written);
 
-# define SSL_EARLY_DATA_NOT_SENT    0
-# define SSL_EARLY_DATA_REJECTED    1
-# define SSL_EARLY_DATA_ACCEPTED    2
+#define SSL_EARLY_DATA_NOT_SENT 0
+#define SSL_EARLY_DATA_REJECTED 1
+#define SSL_EARLY_DATA_ACCEPTED 2
 
 __owur int SSL_get_early_data_status(const SSL *s);
 
@@ -1985,68 +1991,68 @@ __owur const char *SSL_get_version(const SSL *s);
 __owur int SSL_get_handshake_rtt(const SSL *s, uint64_t *rtt);
 
 /* This sets the 'default' SSL version that SSL_new() will create */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 __owur int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-# endif
+#endif
 
-# ifndef OPENSSL_NO_SSL3_METHOD
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_SSL3_METHOD
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *SSLv3_method(void); /* SSLv3 */
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *SSLv3_server_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *SSLv3_client_method(void);
-#  endif
-# endif
+#endif
+#endif
 
-#define SSLv23_method           TLS_method
-#define SSLv23_server_method    TLS_server_method
-#define SSLv23_client_method    TLS_client_method
+#define SSLv23_method TLS_method
+#define SSLv23_server_method TLS_server_method
+#define SSLv23_client_method TLS_client_method
 
 /* Negotiate highest available SSL/TLS version */
 __owur const SSL_METHOD *TLS_method(void);
 __owur const SSL_METHOD *TLS_server_method(void);
 __owur const SSL_METHOD *TLS_client_method(void);
 
-# ifndef OPENSSL_NO_TLS1_METHOD
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_TLS1_METHOD
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_server_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_client_method(void);
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_TLS1_1_METHOD
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_TLS1_1_METHOD
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_1_server_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_1_client_method(void);
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_TLS1_2_METHOD
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_TLS1_2_METHOD
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_2_server_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *TLSv1_2_client_method(void);
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_DTLS1_METHOD
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DTLS1_METHOD
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *DTLSv1_server_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *DTLSv1_client_method(void);
-#  endif
-# endif
+#endif
+#endif
 
-# ifndef OPENSSL_NO_DTLS1_2_METHOD
+#ifndef OPENSSL_NO_DTLS1_2_METHOD
 /* DTLSv1.2 */
-#  ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *DTLSv1_2_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *DTLSv1_2_server_method(void);
 OSSL_DEPRECATEDIN_1_1_0 __owur const SSL_METHOD *DTLSv1_2_client_method(void);
-#  endif
-# endif
+#endif
+#endif
 
 __owur const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
 __owur const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */
@@ -2099,9 +2105,9 @@ void SSL_set_accept_state(SSL *s);
 
 __owur long SSL_get_default_timeout(const SSL *s);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define SSL_library_init() OPENSSL_init_ssl(0, NULL)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define SSL_library_init() OPENSSL_init_ssl(0, NULL)
+#endif
 
 __owur char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
 __owur STACK_OF(X509_NAME) *SSL_dup_CA_list(const STACK_OF(X509_NAME) *sk);
@@ -2133,17 +2139,17 @@ __owur int SSL_CTX_load_verify_file(SSL_CTX *ctx, const char *CAfile);
 __owur int SSL_CTX_load_verify_dir(SSL_CTX *ctx, const char *CApath);
 __owur int SSL_CTX_load_verify_store(SSL_CTX *ctx, const char *CAstore);
 __owur int SSL_CTX_load_verify_locations(SSL_CTX *ctx,
-                                                        const char *CAfile,
-                                                        const char *CApath);
-# define SSL_get0_session SSL_get_session/* just peek at pointer */
+    const char *CAfile,
+    const char *CApath);
+#define SSL_get0_session SSL_get_session /* just peek at pointer */
 __owur SSL_SESSION *SSL_get_session(const SSL *ssl);
 __owur SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
 __owur SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
 SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx);
 void SSL_set_info_callback(SSL *ssl,
-                           void (*cb) (const SSL *ssl, int type, int val));
-void (*SSL_get_info_callback(const SSL *ssl)) (const SSL *ssl, int type,
-                                               int val);
+    void (*cb)(const SSL *ssl, int type, int val));
+void (*SSL_get_info_callback(const SSL *ssl))(const SSL *ssl, int type,
+    int val);
 __owur OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl);
 
 void SSL_set_verify_result(SSL *ssl, long v);
@@ -2151,13 +2157,13 @@ __owur long SSL_get_verify_result(const SSL *ssl);
 __owur STACK_OF(X509) *SSL_get0_verified_chain(const SSL *s);
 
 __owur size_t SSL_get_client_random(const SSL *ssl, unsigned char *out,
-                                    size_t outlen);
+    size_t outlen);
 __owur size_t SSL_get_server_random(const SSL *ssl, unsigned char *out,
-                                    size_t outlen);
+    size_t outlen);
 __owur size_t SSL_SESSION_get_master_key(const SSL_SESSION *sess,
-                                         unsigned char *out, size_t outlen);
+    unsigned char *out, size_t outlen);
 __owur int SSL_SESSION_set1_master_key(SSL_SESSION *sess,
-                                       const unsigned char *in, size_t len);
+    const unsigned char *in, size_t len);
 uint8_t SSL_SESSION_get_max_fragment_length(const SSL_SESSION *sess);
 
 #define SSL_get_ex_new_index(l, p, newf, dupf, freef) \
@@ -2175,61 +2181,61 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *ssl, int idx);
 
 __owur int SSL_get_ex_data_X509_STORE_CTX_idx(void);
 
-# define SSL_CTX_sess_set_cache_size(ctx,t) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
-# define SSL_CTX_sess_get_cache_size(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_SIZE,0,NULL)
-# define SSL_CTX_set_session_cache_mode(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL)
-# define SSL_CTX_get_session_cache_mode(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_MODE,0,NULL)
+#define SSL_CTX_sess_set_cache_size(ctx, t) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SESS_CACHE_SIZE, t, NULL)
+#define SSL_CTX_sess_get_cache_size(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_SESS_CACHE_SIZE, 0, NULL)
+#define SSL_CTX_set_session_cache_mode(ctx, m) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SESS_CACHE_MODE, m, NULL)
+#define SSL_CTX_get_session_cache_mode(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_SESS_CACHE_MODE, 0, NULL)
 
-# define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
-# define SSL_CTX_set_default_read_ahead(ctx,m) SSL_CTX_set_read_ahead(ctx,m)
-# define SSL_CTX_get_read_ahead(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
-# define SSL_CTX_set_read_ahead(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,m,NULL)
-# define SSL_CTX_get_max_cert_list(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_CTX_set_max_cert_list(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-# define SSL_get_max_cert_list(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_set_max_cert_list(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
+#define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
+#define SSL_CTX_set_default_read_ahead(ctx, m) SSL_CTX_set_read_ahead(ctx, m)
+#define SSL_CTX_get_read_ahead(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_READ_AHEAD, 0, NULL)
+#define SSL_CTX_set_read_ahead(ctx, m) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_READ_AHEAD, m, NULL)
+#define SSL_CTX_get_max_cert_list(ctx) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_CERT_LIST, 0, NULL)
+#define SSL_CTX_set_max_cert_list(ctx, m) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_CERT_LIST, m, NULL)
+#define SSL_get_max_cert_list(ssl) \
+    SSL_ctrl(ssl, SSL_CTRL_GET_MAX_CERT_LIST, 0, NULL)
+#define SSL_set_max_cert_list(ssl, m) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_MAX_CERT_LIST, m, NULL)
 
-# define SSL_CTX_set_max_send_fragment(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-# define SSL_set_max_send_fragment(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-# define SSL_CTX_set_split_send_fragment(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SPLIT_SEND_FRAGMENT,m,NULL)
-# define SSL_set_split_send_fragment(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_SPLIT_SEND_FRAGMENT,m,NULL)
-# define SSL_CTX_set_max_pipelines(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
-# define SSL_set_max_pipelines(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_PIPELINES,m,NULL)
-# define SSL_set_retry_verify(ssl) \
-        (SSL_ctrl(ssl,SSL_CTRL_SET_RETRY_VERIFY,0,NULL) > 0)
+#define SSL_CTX_set_max_send_fragment(ctx, m) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_SEND_FRAGMENT, m, NULL)
+#define SSL_set_max_send_fragment(ssl, m) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_MAX_SEND_FRAGMENT, m, NULL)
+#define SSL_CTX_set_split_send_fragment(ctx, m) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SPLIT_SEND_FRAGMENT, m, NULL)
+#define SSL_set_split_send_fragment(ssl, m) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_SPLIT_SEND_FRAGMENT, m, NULL)
+#define SSL_CTX_set_max_pipelines(ctx, m) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PIPELINES, m, NULL)
+#define SSL_set_max_pipelines(ssl, m) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_MAX_PIPELINES, m, NULL)
+#define SSL_set_retry_verify(ssl) \
+    (SSL_ctrl(ssl, SSL_CTRL_SET_RETRY_VERIFY, 0, NULL) > 0)
 
 void SSL_CTX_set_default_read_buffer_len(SSL_CTX *ctx, size_t len);
 void SSL_set_default_read_buffer_len(SSL *s, size_t len);
 
-# ifndef OPENSSL_NO_DH
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DH
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* NB: the |keylength| is only applicable when is_export is true */
 OSSL_DEPRECATEDIN_3_0
 void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
-                                 DH *(*dh) (SSL *ssl, int is_export,
-                                            int keylength));
+    DH *(*dh)(SSL *ssl, int is_export,
+        int keylength));
 OSSL_DEPRECATEDIN_3_0
 void SSL_set_tmp_dh_callback(SSL *ssl,
-                             DH *(*dh) (SSL *ssl, int is_export,
-                                        int keylength));
-#  endif
-# endif
+    DH *(*dh)(SSL *ssl, int is_export,
+        int keylength));
+#endif
+#endif
 
 __owur const COMP_METHOD *SSL_get_current_compression(const SSL *s);
 __owur const COMP_METHOD *SSL_get_current_expansion(const SSL *s);
@@ -2238,57 +2244,59 @@ __owur const char *SSL_COMP_get0_name(const SSL_COMP *comp);
 __owur int SSL_COMP_get_id(const SSL_COMP *comp);
 STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
 __owur STACK_OF(SSL_COMP) *SSL_COMP_set0_compression_methods(STACK_OF(SSL_COMP)
-                                                             *meths);
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define SSL_COMP_free_compression_methods() while(0) continue
-# endif
+        *meths);
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define SSL_COMP_free_compression_methods() \
+    while (0)                               \
+    continue
+#endif
 __owur int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);
 
 const SSL_CIPHER *SSL_CIPHER_find(SSL *ssl, const unsigned char *ptr);
 int SSL_CIPHER_get_cipher_nid(const SSL_CIPHER *c);
 int SSL_CIPHER_get_digest_nid(const SSL_CIPHER *c);
 int SSL_bytes_to_cipher_list(SSL *s, const unsigned char *bytes, size_t len,
-                             int isv2format, STACK_OF(SSL_CIPHER) **sk,
-                             STACK_OF(SSL_CIPHER) **scsvs);
+    int isv2format, STACK_OF(SSL_CIPHER) **sk,
+    STACK_OF(SSL_CIPHER) **scsvs);
 
 /* TLS extensions functions */
 __owur int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
 
 __owur int SSL_set_session_ticket_ext_cb(SSL *s,
-                                         tls_session_ticket_ext_cb_fn cb,
-                                         void *arg);
+    tls_session_ticket_ext_cb_fn cb,
+    void *arg);
 
 /* Pre-shared secret session resumption functions */
 __owur int SSL_set_session_secret_cb(SSL *s,
-                                     tls_session_secret_cb_fn session_secret_cb,
-                                     void *arg);
+    tls_session_secret_cb_fn session_secret_cb,
+    void *arg);
 
 void SSL_CTX_set_not_resumable_session_callback(SSL_CTX *ctx,
-                                                int (*cb) (SSL *ssl,
-                                                           int
-                                                           is_forward_secure));
+    int (*cb)(SSL *ssl,
+        int
+            is_forward_secure));
 
 void SSL_set_not_resumable_session_callback(SSL *ssl,
-                                            int (*cb) (SSL *ssl,
-                                                       int is_forward_secure));
+    int (*cb)(SSL *ssl,
+        int is_forward_secure));
 
 void SSL_CTX_set_record_padding_callback(SSL_CTX *ctx,
-                                         size_t (*cb) (SSL *ssl, int type,
-                                                       size_t len, void *arg));
+    size_t (*cb)(SSL *ssl, int type,
+        size_t len, void *arg));
 void SSL_CTX_set_record_padding_callback_arg(SSL_CTX *ctx, void *arg);
 void *SSL_CTX_get_record_padding_callback_arg(const SSL_CTX *ctx);
 int SSL_CTX_set_block_padding(SSL_CTX *ctx, size_t block_size);
 int SSL_CTX_set_block_padding_ex(SSL_CTX *ctx, size_t app_block_size,
-                                 size_t hs_block_size);
+    size_t hs_block_size);
 
 int SSL_set_record_padding_callback(SSL *ssl,
-                                    size_t (*cb) (SSL *ssl, int type,
-                                                  size_t len, void *arg));
+    size_t (*cb)(SSL *ssl, int type,
+        size_t len, void *arg));
 void SSL_set_record_padding_callback_arg(SSL *ssl, void *arg);
 void *SSL_get_record_padding_callback_arg(const SSL *ssl);
 int SSL_set_block_padding(SSL *ssl, size_t block_size);
 int SSL_set_block_padding_ex(SSL *ssl, size_t app_block_size,
-                             size_t hs_block_size);
+    size_t hs_block_size);
 int SSL_set_num_tickets(SSL *s, size_t num_tickets);
 size_t SSL_get_num_tickets(const SSL *s);
 int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets);
@@ -2309,11 +2317,11 @@ __owur int SSL_is_connection(SSL *s);
 
 __owur int SSL_is_listener(SSL *ssl);
 __owur SSL *SSL_get0_listener(SSL *s);
-#define SSL_LISTENER_FLAG_NO_VALIDATE   (1UL << 1)
+#define SSL_LISTENER_FLAG_NO_VALIDATE (1UL << 1)
 __owur SSL *SSL_new_listener(SSL_CTX *ctx, uint64_t flags);
 __owur SSL *SSL_new_listener_from(SSL *ssl, uint64_t flags);
 __owur SSL *SSL_new_from_listener(SSL *ssl, uint64_t flags);
-#define SSL_ACCEPT_CONNECTION_NO_BLOCK  (1UL << 0)
+#define SSL_ACCEPT_CONNECTION_NO_BLOCK (1UL << 0)
 __owur SSL *SSL_accept_connection(SSL *ssl, uint64_t flags);
 __owur size_t SSL_get_accept_connection_queue_len(SSL *ssl);
 __owur int SSL_listen(SSL *ssl);
@@ -2322,64 +2330,64 @@ __owur int SSL_is_domain(SSL *s);
 __owur SSL *SSL_get0_domain(SSL *s);
 __owur SSL *SSL_new_domain(SSL_CTX *ctx, uint64_t flags);
 
-#define SSL_DOMAIN_FLAG_SINGLE_THREAD       (1U << 0)
-#define SSL_DOMAIN_FLAG_MULTI_THREAD        (1U << 1)
-#define SSL_DOMAIN_FLAG_THREAD_ASSISTED     (1U << 2)
-#define SSL_DOMAIN_FLAG_BLOCKING            (1U << 3)
-#define SSL_DOMAIN_FLAG_LEGACY_BLOCKING     (1U << 4)
+#define SSL_DOMAIN_FLAG_SINGLE_THREAD (1U << 0)
+#define SSL_DOMAIN_FLAG_MULTI_THREAD (1U << 1)
+#define SSL_DOMAIN_FLAG_THREAD_ASSISTED (1U << 2)
+#define SSL_DOMAIN_FLAG_BLOCKING (1U << 3)
+#define SSL_DOMAIN_FLAG_LEGACY_BLOCKING (1U << 4)
 
 __owur int SSL_CTX_set_domain_flags(SSL_CTX *ctx, uint64_t domain_flags);
 __owur int SSL_CTX_get_domain_flags(const SSL_CTX *ctx, uint64_t *domain_flags);
 __owur int SSL_get_domain_flags(const SSL *ssl, uint64_t *domain_flags);
 
-#define SSL_STREAM_TYPE_NONE        0
-#define SSL_STREAM_TYPE_READ        (1U << 0)
-#define SSL_STREAM_TYPE_WRITE       (1U << 1)
-#define SSL_STREAM_TYPE_BIDI        (SSL_STREAM_TYPE_READ | SSL_STREAM_TYPE_WRITE)
+#define SSL_STREAM_TYPE_NONE 0
+#define SSL_STREAM_TYPE_READ (1U << 0)
+#define SSL_STREAM_TYPE_WRITE (1U << 1)
+#define SSL_STREAM_TYPE_BIDI (SSL_STREAM_TYPE_READ | SSL_STREAM_TYPE_WRITE)
 __owur int SSL_get_stream_type(SSL *s);
 
 __owur uint64_t SSL_get_stream_id(SSL *s);
 __owur int SSL_is_stream_local(SSL *s);
 
-#define SSL_DEFAULT_STREAM_MODE_NONE        0
-#define SSL_DEFAULT_STREAM_MODE_AUTO_BIDI   1
-#define SSL_DEFAULT_STREAM_MODE_AUTO_UNI    2
+#define SSL_DEFAULT_STREAM_MODE_NONE 0
+#define SSL_DEFAULT_STREAM_MODE_AUTO_BIDI 1
+#define SSL_DEFAULT_STREAM_MODE_AUTO_UNI 2
 __owur int SSL_set_default_stream_mode(SSL *s, uint32_t mode);
 
-#define SSL_STREAM_FLAG_UNI         (1U << 0)
-#define SSL_STREAM_FLAG_NO_BLOCK    (1U << 1)
-#define SSL_STREAM_FLAG_ADVANCE     (1U << 2)
+#define SSL_STREAM_FLAG_UNI (1U << 0)
+#define SSL_STREAM_FLAG_NO_BLOCK (1U << 1)
+#define SSL_STREAM_FLAG_ADVANCE (1U << 2)
 __owur SSL *SSL_new_stream(SSL *s, uint64_t flags);
 
-#define SSL_INCOMING_STREAM_POLICY_AUTO      0
-#define SSL_INCOMING_STREAM_POLICY_ACCEPT    1
-#define SSL_INCOMING_STREAM_POLICY_REJECT    2
+#define SSL_INCOMING_STREAM_POLICY_AUTO 0
+#define SSL_INCOMING_STREAM_POLICY_ACCEPT 1
+#define SSL_INCOMING_STREAM_POLICY_REJECT 2
 __owur int SSL_set_incoming_stream_policy(SSL *s, int policy, uint64_t aec);
 
-#define SSL_ACCEPT_STREAM_NO_BLOCK      (1U << 0)
+#define SSL_ACCEPT_STREAM_NO_BLOCK (1U << 0)
 __owur SSL *SSL_accept_stream(SSL *s, uint64_t flags);
 __owur size_t SSL_get_accept_stream_queue_len(SSL *s);
 
-# ifndef OPENSSL_NO_QUIC
+#ifndef OPENSSL_NO_QUIC
 __owur int SSL_inject_net_dgram(SSL *s, const unsigned char *buf,
-                                size_t buf_len,
-                                const BIO_ADDR *peer,
-                                const BIO_ADDR *local);
-# endif
+    size_t buf_len,
+    const BIO_ADDR *peer,
+    const BIO_ADDR *local);
+#endif
 
 typedef struct ssl_shutdown_ex_args_st {
-    uint64_t    quic_error_code;
-    const char  *quic_reason;
+    uint64_t quic_error_code;
+    const char *quic_reason;
 } SSL_SHUTDOWN_EX_ARGS;
 
-#define SSL_SHUTDOWN_FLAG_RAPID             (1U << 0)
-#define SSL_SHUTDOWN_FLAG_NO_STREAM_FLUSH   (1U << 1)
-#define SSL_SHUTDOWN_FLAG_NO_BLOCK          (1U << 2)
-#define SSL_SHUTDOWN_FLAG_WAIT_PEER         (1U << 3)
+#define SSL_SHUTDOWN_FLAG_RAPID (1U << 0)
+#define SSL_SHUTDOWN_FLAG_NO_STREAM_FLUSH (1U << 1)
+#define SSL_SHUTDOWN_FLAG_NO_BLOCK (1U << 2)
+#define SSL_SHUTDOWN_FLAG_WAIT_PEER (1U << 3)
 
 __owur int SSL_shutdown_ex(SSL *ssl, uint64_t flags,
-                           const SSL_SHUTDOWN_EX_ARGS *args,
-                           size_t args_len);
+    const SSL_SHUTDOWN_EX_ARGS *args,
+    size_t args_len);
 
 __owur int SSL_stream_conclude(SSL *ssl, uint64_t flags);
 
@@ -2388,157 +2396,157 @@ typedef struct ssl_stream_reset_args_st {
 } SSL_STREAM_RESET_ARGS;
 
 __owur int SSL_stream_reset(SSL *ssl,
-                            const SSL_STREAM_RESET_ARGS *args,
-                            size_t args_len);
+    const SSL_STREAM_RESET_ARGS *args,
+    size_t args_len);
 
-#define SSL_STREAM_STATE_NONE           0
-#define SSL_STREAM_STATE_OK             1
-#define SSL_STREAM_STATE_WRONG_DIR      2
-#define SSL_STREAM_STATE_FINISHED       3
-#define SSL_STREAM_STATE_RESET_LOCAL    4
-#define SSL_STREAM_STATE_RESET_REMOTE   5
-#define SSL_STREAM_STATE_CONN_CLOSED    6
+#define SSL_STREAM_STATE_NONE 0
+#define SSL_STREAM_STATE_OK 1
+#define SSL_STREAM_STATE_WRONG_DIR 2
+#define SSL_STREAM_STATE_FINISHED 3
+#define SSL_STREAM_STATE_RESET_LOCAL 4
+#define SSL_STREAM_STATE_RESET_REMOTE 5
+#define SSL_STREAM_STATE_CONN_CLOSED 6
 __owur int SSL_get_stream_read_state(SSL *ssl);
 __owur int SSL_get_stream_write_state(SSL *ssl);
 
 __owur int SSL_get_stream_read_error_code(SSL *ssl, uint64_t *app_error_code);
 __owur int SSL_get_stream_write_error_code(SSL *ssl, uint64_t *app_error_code);
 
-#define SSL_CONN_CLOSE_FLAG_LOCAL       (1U << 0)
-#define SSL_CONN_CLOSE_FLAG_TRANSPORT   (1U << 1)
+#define SSL_CONN_CLOSE_FLAG_LOCAL (1U << 0)
+#define SSL_CONN_CLOSE_FLAG_TRANSPORT (1U << 1)
 
 typedef struct ssl_conn_close_info_st {
-    uint64_t    error_code, frame_type;
-    const char  *reason;
-    size_t      reason_len;
-    uint32_t    flags;
+    uint64_t error_code, frame_type;
+    const char *reason;
+    size_t reason_len;
+    uint32_t flags;
 } SSL_CONN_CLOSE_INFO;
 
 __owur int SSL_get_conn_close_info(SSL *ssl,
-                                   SSL_CONN_CLOSE_INFO *info,
-                                   size_t info_len);
+    SSL_CONN_CLOSE_INFO *info,
+    size_t info_len);
 
-# define SSL_VALUE_CLASS_GENERIC                0
-# define SSL_VALUE_CLASS_FEATURE_REQUEST        1
-# define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST   2
-# define SSL_VALUE_CLASS_FEATURE_NEGOTIATED     3
+#define SSL_VALUE_CLASS_GENERIC 0
+#define SSL_VALUE_CLASS_FEATURE_REQUEST 1
+#define SSL_VALUE_CLASS_FEATURE_PEER_REQUEST 2
+#define SSL_VALUE_CLASS_FEATURE_NEGOTIATED 3
 
-# define SSL_VALUE_NONE                             0
-# define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL     1
-# define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL    2
-# define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL      3
-# define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL     4
-# define SSL_VALUE_QUIC_IDLE_TIMEOUT                5
-# define SSL_VALUE_EVENT_HANDLING_MODE              6
-# define SSL_VALUE_STREAM_WRITE_BUF_SIZE            7
-# define SSL_VALUE_STREAM_WRITE_BUF_USED            8
-# define SSL_VALUE_STREAM_WRITE_BUF_AVAIL           9
+#define SSL_VALUE_NONE 0
+#define SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL 1
+#define SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL 2
+#define SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL 3
+#define SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL 4
+#define SSL_VALUE_QUIC_IDLE_TIMEOUT 5
+#define SSL_VALUE_EVENT_HANDLING_MODE 6
+#define SSL_VALUE_STREAM_WRITE_BUF_SIZE 7
+#define SSL_VALUE_STREAM_WRITE_BUF_USED 8
+#define SSL_VALUE_STREAM_WRITE_BUF_AVAIL 9
 
-# define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT      0
-# define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT     1
-# define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT     2
+#define SSL_VALUE_EVENT_HANDLING_MODE_INHERIT 0
+#define SSL_VALUE_EVENT_HANDLING_MODE_IMPLICIT 1
+#define SSL_VALUE_EVENT_HANDLING_MODE_EXPLICIT 2
 
 int SSL_get_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t *v);
 int SSL_set_value_uint(SSL *s, uint32_t class_, uint32_t id, uint64_t v);
 
-# define SSL_get_generic_value_uint(ssl, id, v) \
+#define SSL_get_generic_value_uint(ssl, id, v) \
     SSL_get_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
-# define SSL_set_generic_value_uint(ssl, id, v) \
+#define SSL_set_generic_value_uint(ssl, id, v) \
     SSL_set_value_uint((ssl), SSL_VALUE_CLASS_GENERIC, (id), (v))
-# define SSL_get_feature_request_uint(ssl, id, v) \
+#define SSL_get_feature_request_uint(ssl, id, v) \
     SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
-# define SSL_set_feature_request_uint(ssl, id, v) \
+#define SSL_set_feature_request_uint(ssl, id, v) \
     SSL_set_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_REQUEST, (id), (v))
-# define SSL_get_feature_peer_request_uint(ssl, id, v) \
+#define SSL_get_feature_peer_request_uint(ssl, id, v) \
     SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_PEER_REQUEST, (id), (v))
-# define SSL_get_feature_negotiated_uint(ssl, id, v) \
+#define SSL_get_feature_negotiated_uint(ssl, id, v) \
     SSL_get_value_uint((ssl), SSL_VALUE_CLASS_FEATURE_NEGOTIATED, (id), (v))
 
-# define SSL_get_quic_stream_bidi_local_avail(ssl, value) \
+#define SSL_get_quic_stream_bidi_local_avail(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_LOCAL_AVAIL, \
-                               (value))
-# define SSL_get_quic_stream_bidi_remote_avail(ssl, value) \
+        (value))
+#define SSL_get_quic_stream_bidi_remote_avail(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_BIDI_REMOTE_AVAIL, \
-                               (value))
-# define SSL_get_quic_stream_uni_local_avail(ssl, value) \
+        (value))
+#define SSL_get_quic_stream_uni_local_avail(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_LOCAL_AVAIL, \
-                               (value))
-# define SSL_get_quic_stream_uni_remote_avail(ssl, value) \
+        (value))
+#define SSL_get_quic_stream_uni_remote_avail(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_QUIC_STREAM_UNI_REMOTE_AVAIL, \
-                               (value))
+        (value))
 
-# define SSL_get_event_handling_mode(ssl, value) \
+#define SSL_get_event_handling_mode(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
-                               (value))
-# define SSL_set_event_handling_mode(ssl, value) \
+        (value))
+#define SSL_set_event_handling_mode(ssl, value)                      \
     SSL_set_generic_value_uint((ssl), SSL_VALUE_EVENT_HANDLING_MODE, \
-                               (value))
+        (value))
 
-# define SSL_get_stream_write_buf_size(ssl, value) \
+#define SSL_get_stream_write_buf_size(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_SIZE, \
-                               (value))
-# define SSL_get_stream_write_buf_used(ssl, value) \
+        (value))
+#define SSL_get_stream_write_buf_used(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_USED, \
-                               (value))
-# define SSL_get_stream_write_buf_avail(ssl, value) \
+        (value))
+#define SSL_get_stream_write_buf_avail(ssl, value)                      \
     SSL_get_generic_value_uint((ssl), SSL_VALUE_STREAM_WRITE_BUF_AVAIL, \
-                               (value))
+        (value))
 
-# define SSL_POLL_EVENT_NONE        0
+#define SSL_POLL_EVENT_NONE 0
 
-# define SSL_POLL_EVENT_F           (1U <<  0) /* F   (Failure) */
-# define SSL_POLL_EVENT_EL          (1U <<  1) /* EL  (Exception on Listener) */
-# define SSL_POLL_EVENT_EC          (1U <<  2) /* EC  (Exception on Conn) */
-# define SSL_POLL_EVENT_ECD         (1U <<  3) /* ECD (Exception on Conn Drained) */
-# define SSL_POLL_EVENT_ER          (1U <<  4) /* ER  (Exception on Read) */
-# define SSL_POLL_EVENT_EW          (1U <<  5) /* EW  (Exception on Write) */
-# define SSL_POLL_EVENT_R           (1U <<  6) /* R   (Readable) */
-# define SSL_POLL_EVENT_W           (1U <<  7) /* W   (Writable) */
-# define SSL_POLL_EVENT_IC          (1U <<  8) /* IC  (Incoming Connection) */
-# define SSL_POLL_EVENT_ISB         (1U <<  9) /* ISB (Incoming Stream: Bidi) */
-# define SSL_POLL_EVENT_ISU         (1U << 10) /* ISU (Incoming Stream: Uni) */
-# define SSL_POLL_EVENT_OSB         (1U << 11) /* OSB (Outgoing Stream: Bidi) */
-# define SSL_POLL_EVENT_OSU         (1U << 12) /* OSU (Outgoing Stream: Uni) */
+#define SSL_POLL_EVENT_F (1U << 0) /* F   (Failure) */
+#define SSL_POLL_EVENT_EL (1U << 1) /* EL  (Exception on Listener) */
+#define SSL_POLL_EVENT_EC (1U << 2) /* EC  (Exception on Conn) */
+#define SSL_POLL_EVENT_ECD (1U << 3) /* ECD (Exception on Conn Drained) */
+#define SSL_POLL_EVENT_ER (1U << 4) /* ER  (Exception on Read) */
+#define SSL_POLL_EVENT_EW (1U << 5) /* EW  (Exception on Write) */
+#define SSL_POLL_EVENT_R (1U << 6) /* R   (Readable) */
+#define SSL_POLL_EVENT_W (1U << 7) /* W   (Writable) */
+#define SSL_POLL_EVENT_IC (1U << 8) /* IC  (Incoming Connection) */
+#define SSL_POLL_EVENT_ISB (1U << 9) /* ISB (Incoming Stream: Bidi) */
+#define SSL_POLL_EVENT_ISU (1U << 10) /* ISU (Incoming Stream: Uni) */
+#define SSL_POLL_EVENT_OSB (1U << 11) /* OSB (Outgoing Stream: Bidi) */
+#define SSL_POLL_EVENT_OSU (1U << 12) /* OSU (Outgoing Stream: Uni) */
 
-# define SSL_POLL_EVENT_RW          (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
-# define SSL_POLL_EVENT_RE          (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
-# define SSL_POLL_EVENT_WE          (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
-# define SSL_POLL_EVENT_RWE         (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
-# define SSL_POLL_EVENT_E           (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
-                                     | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
-# define SSL_POLL_EVENT_IS          (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
-# define SSL_POLL_EVENT_ISE         (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
-# define SSL_POLL_EVENT_I           (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
-# define SSL_POLL_EVENT_OS          (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
-# define SSL_POLL_EVENT_OSE         (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
+#define SSL_POLL_EVENT_RW (SSL_POLL_EVENT_R | SSL_POLL_EVENT_W)
+#define SSL_POLL_EVENT_RE (SSL_POLL_EVENT_R | SSL_POLL_EVENT_ER)
+#define SSL_POLL_EVENT_WE (SSL_POLL_EVENT_W | SSL_POLL_EVENT_EW)
+#define SSL_POLL_EVENT_RWE (SSL_POLL_EVENT_RE | SSL_POLL_EVENT_WE)
+#define SSL_POLL_EVENT_E (SSL_POLL_EVENT_EL | SSL_POLL_EVENT_EC \
+    | SSL_POLL_EVENT_ER | SSL_POLL_EVENT_EW)
+#define SSL_POLL_EVENT_IS (SSL_POLL_EVENT_ISB | SSL_POLL_EVENT_ISU)
+#define SSL_POLL_EVENT_ISE (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_EC)
+#define SSL_POLL_EVENT_I (SSL_POLL_EVENT_IS | SSL_POLL_EVENT_IC)
+#define SSL_POLL_EVENT_OS (SSL_POLL_EVENT_OSB | SSL_POLL_EVENT_OSU)
+#define SSL_POLL_EVENT_OSE (SSL_POLL_EVENT_OS | SSL_POLL_EVENT_EC)
 
 typedef struct ssl_poll_item_st {
     BIO_POLL_DESCRIPTOR desc;
-    uint64_t            events, revents;
+    uint64_t events, revents;
 } SSL_POLL_ITEM;
 
-# define SSL_POLL_FLAG_NO_HANDLE_EVENTS  (1U << 0)
+#define SSL_POLL_FLAG_NO_HANDLE_EVENTS (1U << 0)
 
 __owur int SSL_poll(SSL_POLL_ITEM *items,
-                    size_t num_items,
-                    size_t stride,
-                    const struct timeval *timeout,
-                    uint64_t flags,
-                    size_t *result_count);
+    size_t num_items,
+    size_t stride,
+    const struct timeval *timeout,
+    uint64_t flags,
+    size_t *result_count);
 
 static ossl_inline ossl_unused BIO_POLL_DESCRIPTOR
 SSL_as_poll_descriptor(SSL *s)
 {
     BIO_POLL_DESCRIPTOR d;
 
-    d.type      = BIO_POLL_DESCRIPTOR_TYPE_SSL;
+    d.type = BIO_POLL_DESCRIPTOR_TYPE_SSL;
     d.value.ssl = s;
     return d;
 }
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define SSL_cache_hit(s) SSL_session_reused(s)
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define SSL_cache_hit(s) SSL_session_reused(s)
+#endif
 
 __owur int SSL_session_reused(const SSL *s);
 __owur int SSL_is_server(const SSL *s);
@@ -2548,7 +2556,7 @@ int SSL_CONF_CTX_finish(SSL_CONF_CTX *cctx);
 void SSL_CONF_CTX_free(SSL_CONF_CTX *cctx);
 unsigned int SSL_CONF_CTX_set_flags(SSL_CONF_CTX *cctx, unsigned int flags);
 __owur unsigned int SSL_CONF_CTX_clear_flags(SSL_CONF_CTX *cctx,
-                                             unsigned int flags);
+    unsigned int flags);
 __owur int SSL_CONF_CTX_set1_prefix(SSL_CONF_CTX *cctx, const char *pre);
 
 void SSL_CONF_CTX_set_ssl(SSL_CONF_CTX *cctx, SSL *ssl);
@@ -2562,16 +2570,16 @@ void SSL_add_ssl_module(void);
 int SSL_config(SSL *s, const char *name);
 int SSL_CTX_config(SSL_CTX *ctx, const char *name);
 
-# ifndef OPENSSL_NO_SSL_TRACE
+#ifndef OPENSSL_NO_SSL_TRACE
 void SSL_trace(int write_p, int version, int content_type,
-               const void *buf, size_t len, SSL *ssl, void *arg);
-# endif
+    const void *buf, size_t len, SSL *ssl, void *arg);
+#endif
 
-# ifndef OPENSSL_NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 int DTLSv1_listen(SSL *s, BIO_ADDR *client);
-# endif
+#endif
 
-# ifndef OPENSSL_NO_CT
+#ifndef OPENSSL_NO_CT
 
 /*
  * A callback for verifying that the received SCTs are sufficient.
@@ -2580,7 +2588,7 @@ int DTLSv1_listen(SSL *s, BIO_ADDR *client);
  * A connection should be aborted if the SCTs are deemed insufficient.
  */
 typedef int (*ssl_ct_validation_cb)(const CT_POLICY_EVAL_CTX *ctx,
-                                    const STACK_OF(SCT) *scts, void *arg);
+    const STACK_OF(SCT) *scts, void *arg);
 
 /*
  * Sets a |callback| that is invoked upon receipt of ServerHelloDone to validate
@@ -2595,14 +2603,14 @@ typedef int (*ssl_ct_validation_cb)(const CT_POLICY_EVAL_CTX *ctx,
  *       will be requested.
  */
 int SSL_set_ct_validation_callback(SSL *s, ssl_ct_validation_cb callback,
-                                   void *arg);
+    void *arg);
 int SSL_CTX_set_ct_validation_callback(SSL_CTX *ctx,
-                                       ssl_ct_validation_cb callback,
-                                       void *arg);
+    ssl_ct_validation_cb callback,
+    void *arg);
 #define SSL_disable_ct(s) \
-        ((void) SSL_set_validation_callback((s), NULL, NULL))
+    ((void)SSL_set_validation_callback((s), NULL, NULL))
 #define SSL_CTX_disable_ct(ctx) \
-        ((void) SSL_CTX_set_validation_callback((ctx), NULL, NULL))
+    ((void)SSL_CTX_set_validation_callback((ctx), NULL, NULL))
 
 /*
  * The validation type enumerates the available behaviours of the built-in SSL
@@ -2667,106 +2675,106 @@ void SSL_CTX_set0_ctlog_store(SSL_CTX *ctx, CTLOG_STORE *logs);
  */
 const CTLOG_STORE *SSL_CTX_get0_ctlog_store(const SSL_CTX *ctx);
 
-# endif /* OPENSSL_NO_CT */
+#endif /* OPENSSL_NO_CT */
 
 /* What the "other" parameter contains in security callback */
 /* Mask for type */
-# define SSL_SECOP_OTHER_TYPE    0xffff0000
-# define SSL_SECOP_OTHER_NONE    0
-# define SSL_SECOP_OTHER_CIPHER  (1 << 16)
-# define SSL_SECOP_OTHER_CURVE   (2 << 16)
-# define SSL_SECOP_OTHER_DH      (3 << 16)
-# define SSL_SECOP_OTHER_PKEY    (4 << 16)
-# define SSL_SECOP_OTHER_SIGALG  (5 << 16)
-# define SSL_SECOP_OTHER_CERT    (6 << 16)
+#define SSL_SECOP_OTHER_TYPE 0xffff0000
+#define SSL_SECOP_OTHER_NONE 0
+#define SSL_SECOP_OTHER_CIPHER (1 << 16)
+#define SSL_SECOP_OTHER_CURVE (2 << 16)
+#define SSL_SECOP_OTHER_DH (3 << 16)
+#define SSL_SECOP_OTHER_PKEY (4 << 16)
+#define SSL_SECOP_OTHER_SIGALG (5 << 16)
+#define SSL_SECOP_OTHER_CERT (6 << 16)
 
 /* Indicated operation refers to peer key or certificate */
-# define SSL_SECOP_PEER          0x1000
+#define SSL_SECOP_PEER 0x1000
 
 /* Values for "op" parameter in security callback */
 
 /* Called to filter ciphers */
 /* Ciphers client supports */
-# define SSL_SECOP_CIPHER_SUPPORTED      (1 | SSL_SECOP_OTHER_CIPHER)
+#define SSL_SECOP_CIPHER_SUPPORTED (1 | SSL_SECOP_OTHER_CIPHER)
 /* Cipher shared by client/server */
-# define SSL_SECOP_CIPHER_SHARED         (2 | SSL_SECOP_OTHER_CIPHER)
+#define SSL_SECOP_CIPHER_SHARED (2 | SSL_SECOP_OTHER_CIPHER)
 /* Sanity check of cipher server selects */
-# define SSL_SECOP_CIPHER_CHECK          (3 | SSL_SECOP_OTHER_CIPHER)
+#define SSL_SECOP_CIPHER_CHECK (3 | SSL_SECOP_OTHER_CIPHER)
 /* Curves supported by client */
-# define SSL_SECOP_CURVE_SUPPORTED       (4 | SSL_SECOP_OTHER_CURVE)
+#define SSL_SECOP_CURVE_SUPPORTED (4 | SSL_SECOP_OTHER_CURVE)
 /* Curves shared by client/server */
-# define SSL_SECOP_CURVE_SHARED          (5 | SSL_SECOP_OTHER_CURVE)
+#define SSL_SECOP_CURVE_SHARED (5 | SSL_SECOP_OTHER_CURVE)
 /* Sanity check of curve server selects */
-# define SSL_SECOP_CURVE_CHECK           (6 | SSL_SECOP_OTHER_CURVE)
+#define SSL_SECOP_CURVE_CHECK (6 | SSL_SECOP_OTHER_CURVE)
 /* Temporary DH key */
-# define SSL_SECOP_TMP_DH                (7 | SSL_SECOP_OTHER_PKEY)
+#define SSL_SECOP_TMP_DH (7 | SSL_SECOP_OTHER_PKEY)
 /* SSL/TLS version */
-# define SSL_SECOP_VERSION               (9 | SSL_SECOP_OTHER_NONE)
+#define SSL_SECOP_VERSION (9 | SSL_SECOP_OTHER_NONE)
 /* Session tickets */
-# define SSL_SECOP_TICKET                (10 | SSL_SECOP_OTHER_NONE)
+#define SSL_SECOP_TICKET (10 | SSL_SECOP_OTHER_NONE)
 /* Supported signature algorithms sent to peer */
-# define SSL_SECOP_SIGALG_SUPPORTED      (11 | SSL_SECOP_OTHER_SIGALG)
+#define SSL_SECOP_SIGALG_SUPPORTED (11 | SSL_SECOP_OTHER_SIGALG)
 /* Shared signature algorithm */
-# define SSL_SECOP_SIGALG_SHARED         (12 | SSL_SECOP_OTHER_SIGALG)
+#define SSL_SECOP_SIGALG_SHARED (12 | SSL_SECOP_OTHER_SIGALG)
 /* Sanity check signature algorithm allowed */
-# define SSL_SECOP_SIGALG_CHECK          (13 | SSL_SECOP_OTHER_SIGALG)
+#define SSL_SECOP_SIGALG_CHECK (13 | SSL_SECOP_OTHER_SIGALG)
 /* Used to get mask of supported public key signature algorithms */
-# define SSL_SECOP_SIGALG_MASK           (14 | SSL_SECOP_OTHER_SIGALG)
+#define SSL_SECOP_SIGALG_MASK (14 | SSL_SECOP_OTHER_SIGALG)
 /* Use to see if compression is allowed */
-# define SSL_SECOP_COMPRESSION           (15 | SSL_SECOP_OTHER_NONE)
+#define SSL_SECOP_COMPRESSION (15 | SSL_SECOP_OTHER_NONE)
 /* EE key in certificate */
-# define SSL_SECOP_EE_KEY                (16 | SSL_SECOP_OTHER_CERT)
+#define SSL_SECOP_EE_KEY (16 | SSL_SECOP_OTHER_CERT)
 /* CA key in certificate */
-# define SSL_SECOP_CA_KEY                (17 | SSL_SECOP_OTHER_CERT)
+#define SSL_SECOP_CA_KEY (17 | SSL_SECOP_OTHER_CERT)
 /* CA digest algorithm in certificate */
-# define SSL_SECOP_CA_MD                 (18 | SSL_SECOP_OTHER_CERT)
+#define SSL_SECOP_CA_MD (18 | SSL_SECOP_OTHER_CERT)
 /* Peer EE key in certificate */
-# define SSL_SECOP_PEER_EE_KEY           (SSL_SECOP_EE_KEY | SSL_SECOP_PEER)
+#define SSL_SECOP_PEER_EE_KEY (SSL_SECOP_EE_KEY | SSL_SECOP_PEER)
 /* Peer CA key in certificate */
-# define SSL_SECOP_PEER_CA_KEY           (SSL_SECOP_CA_KEY | SSL_SECOP_PEER)
+#define SSL_SECOP_PEER_CA_KEY (SSL_SECOP_CA_KEY | SSL_SECOP_PEER)
 /* Peer CA digest algorithm in certificate */
-# define SSL_SECOP_PEER_CA_MD            (SSL_SECOP_CA_MD | SSL_SECOP_PEER)
+#define SSL_SECOP_PEER_CA_MD (SSL_SECOP_CA_MD | SSL_SECOP_PEER)
 
 void SSL_set_security_level(SSL *s, int level);
 __owur int SSL_get_security_level(const SSL *s);
 void SSL_set_security_callback(SSL *s,
-                               int (*cb) (const SSL *s, const SSL_CTX *ctx,
-                                          int op, int bits, int nid,
-                                          void *other, void *ex));
-int (*SSL_get_security_callback(const SSL *s)) (const SSL *s,
-                                                const SSL_CTX *ctx, int op,
-                                                int bits, int nid, void *other,
-                                                void *ex);
+    int (*cb)(const SSL *s, const SSL_CTX *ctx,
+        int op, int bits, int nid,
+        void *other, void *ex));
+int (*SSL_get_security_callback(const SSL *s))(const SSL *s,
+    const SSL_CTX *ctx, int op,
+    int bits, int nid, void *other,
+    void *ex);
 void SSL_set0_security_ex_data(SSL *s, void *ex);
 __owur void *SSL_get0_security_ex_data(const SSL *s);
 
 void SSL_CTX_set_security_level(SSL_CTX *ctx, int level);
 __owur int SSL_CTX_get_security_level(const SSL_CTX *ctx);
 void SSL_CTX_set_security_callback(SSL_CTX *ctx,
-                                   int (*cb) (const SSL *s, const SSL_CTX *ctx,
-                                              int op, int bits, int nid,
-                                              void *other, void *ex));
-int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx)) (const SSL *s,
-                                                          const SSL_CTX *ctx,
-                                                          int op, int bits,
-                                                          int nid,
-                                                          void *other,
-                                                          void *ex);
+    int (*cb)(const SSL *s, const SSL_CTX *ctx,
+        int op, int bits, int nid,
+        void *other, void *ex));
+int (*SSL_CTX_get_security_callback(const SSL_CTX *ctx))(const SSL *s,
+    const SSL_CTX *ctx,
+    int op, int bits,
+    int nid,
+    void *other,
+    void *ex);
 void SSL_CTX_set0_security_ex_data(SSL_CTX *ctx, void *ex);
 __owur void *SSL_CTX_get0_security_ex_data(const SSL_CTX *ctx);
 
 /* OPENSSL_INIT flag 0x010000 reserved for internal use */
-# define OPENSSL_INIT_NO_LOAD_SSL_STRINGS    0x00100000L
-# define OPENSSL_INIT_LOAD_SSL_STRINGS       0x00200000L
+#define OPENSSL_INIT_NO_LOAD_SSL_STRINGS 0x00100000L
+#define OPENSSL_INIT_LOAD_SSL_STRINGS 0x00200000L
 
-# define OPENSSL_INIT_SSL_DEFAULT \
-        (OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS)
+#define OPENSSL_INIT_SSL_DEFAULT \
+    (OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS)
 
 int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
 
-# ifndef OPENSSL_NO_UNIT_TEST
+#ifndef OPENSSL_NO_UNIT_TEST
 __owur const struct openssl_ssl_test_functions *SSL_test_functions(void);
-# endif
+#endif
 
 __owur int SSL_free_buffers(SSL *ssl);
 __owur int SSL_alloc_buffers(SSL *ssl);
@@ -2777,44 +2785,44 @@ typedef int SSL_TICKET_STATUS;
 
 /* Support for ticket appdata */
 /* fatal error, malloc failure */
-# define SSL_TICKET_FATAL_ERR_MALLOC 0
+#define SSL_TICKET_FATAL_ERR_MALLOC 0
 /* fatal error, either from parsing or decrypting the ticket */
-# define SSL_TICKET_FATAL_ERR_OTHER  1
+#define SSL_TICKET_FATAL_ERR_OTHER 1
 /* No ticket present */
-# define SSL_TICKET_NONE             2
+#define SSL_TICKET_NONE 2
 /* Empty ticket present */
-# define SSL_TICKET_EMPTY            3
+#define SSL_TICKET_EMPTY 3
 /* the ticket couldn't be decrypted */
-# define SSL_TICKET_NO_DECRYPT       4
+#define SSL_TICKET_NO_DECRYPT 4
 /* a ticket was successfully decrypted */
-# define SSL_TICKET_SUCCESS          5
+#define SSL_TICKET_SUCCESS 5
 /* same as above but the ticket needs to be renewed */
-# define SSL_TICKET_SUCCESS_RENEW    6
+#define SSL_TICKET_SUCCESS_RENEW 6
 
 /* Return codes for the decrypt session ticket callback */
 typedef int SSL_TICKET_RETURN;
 
 /* An error occurred */
-#define SSL_TICKET_RETURN_ABORT             0
+#define SSL_TICKET_RETURN_ABORT 0
 /* Do not use the ticket, do not send a renewed ticket to the client */
-#define SSL_TICKET_RETURN_IGNORE            1
+#define SSL_TICKET_RETURN_IGNORE 1
 /* Do not use the ticket, send a renewed ticket to the client */
-#define SSL_TICKET_RETURN_IGNORE_RENEW      2
+#define SSL_TICKET_RETURN_IGNORE_RENEW 2
 /* Use the ticket, do not send a renewed ticket to the client */
-#define SSL_TICKET_RETURN_USE               3
+#define SSL_TICKET_RETURN_USE 3
 /* Use the ticket, send a renewed ticket to the client */
-#define SSL_TICKET_RETURN_USE_RENEW         4
+#define SSL_TICKET_RETURN_USE_RENEW 4
 
 typedef int (*SSL_CTX_generate_session_ticket_fn)(SSL *s, void *arg);
 typedef SSL_TICKET_RETURN (*SSL_CTX_decrypt_session_ticket_fn)(SSL *s, SSL_SESSION *ss,
-                                                               const unsigned char *keyname,
-                                                               size_t keyname_length,
-                                                               SSL_TICKET_STATUS status,
-                                                               void *arg);
+    const unsigned char *keyname,
+    size_t keyname_length,
+    SSL_TICKET_STATUS status,
+    void *arg);
 int SSL_CTX_set_session_ticket_cb(SSL_CTX *ctx,
-                                  SSL_CTX_generate_session_ticket_fn gen_cb,
-                                  SSL_CTX_decrypt_session_ticket_fn dec_cb,
-                                  void *arg);
+    SSL_CTX_generate_session_ticket_fn gen_cb,
+    SSL_CTX_decrypt_session_ticket_fn dec_cb,
+    void *arg);
 int SSL_SESSION_set1_ticket_appdata(SSL_SESSION *ss, const void *data, size_t len);
 int SSL_SESSION_get0_ticket_appdata(SSL_SESSION *ss, void **data, size_t *len);
 
@@ -2822,14 +2830,13 @@ typedef unsigned int (*DTLS_timer_cb)(SSL *s, unsigned int timer_us);
 
 void DTLS_set_timer_cb(SSL *s, DTLS_timer_cb cb);
 
-
 typedef int (*SSL_allow_early_data_cb_fn)(SSL *s, void *arg);
 void SSL_CTX_set_allow_early_data_cb(SSL_CTX *ctx,
-                                     SSL_allow_early_data_cb_fn cb,
-                                     void *arg);
+    SSL_allow_early_data_cb_fn cb,
+    void *arg);
 void SSL_set_allow_early_data_cb(SSL *s,
-                                 SSL_allow_early_data_cb_fn cb,
-                                 void *arg);
+    SSL_allow_early_data_cb_fn cb,
+    void *arg);
 
 /* store the default cipher strings inside the library */
 const char *OSSL_default_cipher_list(void);
@@ -2844,9 +2851,9 @@ int SSL_CTX_set1_cert_comp_preference(SSL_CTX *ctx, int *algs, size_t len);
 int SSL_set1_cert_comp_preference(SSL *ssl, int *algs, size_t len);
 
 int SSL_CTX_set1_compressed_cert(SSL_CTX *ctx, int algorithm, unsigned char *comp_data,
-                                size_t comp_length, size_t orig_length);
+    size_t comp_length, size_t orig_length);
 int SSL_set1_compressed_cert(SSL *ssl, int algorithm, unsigned char *comp_data,
-                            size_t comp_length, size_t orig_length);
+    size_t comp_length, size_t orig_length);
 size_t SSL_CTX_get1_compressed_cert(SSL_CTX *ctx, int alg, unsigned char **data, size_t *orig_len);
 size_t SSL_get1_compressed_cert(SSL *ssl, int alg, unsigned char **data, size_t *orig_len);
 
@@ -2868,19 +2875,19 @@ __owur int SSL_CTX_get0_server_cert_type(const SSL_CTX *s, unsigned char **t, si
 /*
  * Protection level. For <= TLSv1.2 only "NONE" and "APPLICATION" are used.
  */
-# define OSSL_RECORD_PROTECTION_LEVEL_NONE        0
-# define OSSL_RECORD_PROTECTION_LEVEL_EARLY       1
-# define OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE   2
-# define OSSL_RECORD_PROTECTION_LEVEL_APPLICATION 3
+#define OSSL_RECORD_PROTECTION_LEVEL_NONE 0
+#define OSSL_RECORD_PROTECTION_LEVEL_EARLY 1
+#define OSSL_RECORD_PROTECTION_LEVEL_HANDSHAKE 2
+#define OSSL_RECORD_PROTECTION_LEVEL_APPLICATION 3
 
 int SSL_set_quic_tls_cbs(SSL *s, const OSSL_DISPATCH *qtdis, void *arg);
 int SSL_set_quic_tls_transport_params(SSL *s,
-                                      const unsigned char *params,
-                                      size_t params_len);
+    const unsigned char *params,
+    size_t params_len);
 
 int SSL_set_quic_tls_early_data_enabled(SSL *s, int enabled);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/ssl2.h b/include/openssl/ssl2.h
index 428ead0540e9..67d1d0291a16 100644
--- a/include/openssl/ssl2.h
+++ b/include/openssl/ssl2.h
@@ -8,23 +8,23 @@
  */
 
 #ifndef OPENSSL_SSL2_H
-# define OPENSSL_SSL2_H
-# pragma once
+#define OPENSSL_SSL2_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SSL2_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SSL2_H
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define SSL2_VERSION            0x0002
+#define SSL2_VERSION 0x0002
 
-# define SSL2_MT_CLIENT_HELLO            1
+#define SSL2_MT_CLIENT_HELLO 1
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index b8dada1b6b15..f35b6eadb0f7 100644
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -9,20 +9,20 @@
  */
 
 #ifndef OPENSSL_SSL3_H
-# define OPENSSL_SSL3_H
-# pragma once
+#define OPENSSL_SSL3_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SSL3_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SSL3_H
+#endif
 
-# include <openssl/comp.h>
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/ssl.h>
+#include <openssl/comp.h>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/ssl.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -30,132 +30,132 @@ extern "C" {
  * Signalling cipher suite value from RFC 5746
  * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV)
  */
-# define SSL3_CK_SCSV                            0x030000FF
+#define SSL3_CK_SCSV 0x030000FF
 
 /*
  * Signalling cipher suite value from draft-ietf-tls-downgrade-scsv-00
  * (TLS_FALLBACK_SCSV)
  */
-# define SSL3_CK_FALLBACK_SCSV                   0x03005600
+#define SSL3_CK_FALLBACK_SCSV 0x03005600
 
-# define SSL3_CK_RSA_NULL_MD5                    0x03000001
-# define SSL3_CK_RSA_NULL_SHA                    0x03000002
-# define SSL3_CK_RSA_RC4_40_MD5                  0x03000003
-# define SSL3_CK_RSA_RC4_128_MD5                 0x03000004
-# define SSL3_CK_RSA_RC4_128_SHA                 0x03000005
-# define SSL3_CK_RSA_RC2_40_MD5                  0x03000006
-# define SSL3_CK_RSA_IDEA_128_SHA                0x03000007
-# define SSL3_CK_RSA_DES_40_CBC_SHA              0x03000008
-# define SSL3_CK_RSA_DES_64_CBC_SHA              0x03000009
-# define SSL3_CK_RSA_DES_192_CBC3_SHA            0x0300000A
+#define SSL3_CK_RSA_NULL_MD5 0x03000001
+#define SSL3_CK_RSA_NULL_SHA 0x03000002
+#define SSL3_CK_RSA_RC4_40_MD5 0x03000003
+#define SSL3_CK_RSA_RC4_128_MD5 0x03000004
+#define SSL3_CK_RSA_RC4_128_SHA 0x03000005
+#define SSL3_CK_RSA_RC2_40_MD5 0x03000006
+#define SSL3_CK_RSA_IDEA_128_SHA 0x03000007
+#define SSL3_CK_RSA_DES_40_CBC_SHA 0x03000008
+#define SSL3_CK_RSA_DES_64_CBC_SHA 0x03000009
+#define SSL3_CK_RSA_DES_192_CBC3_SHA 0x0300000A
 
-# define SSL3_CK_DH_DSS_DES_40_CBC_SHA           0x0300000B
-# define SSL3_CK_DH_DSS_DES_64_CBC_SHA           0x0300000C
-# define SSL3_CK_DH_DSS_DES_192_CBC3_SHA         0x0300000D
-# define SSL3_CK_DH_RSA_DES_40_CBC_SHA           0x0300000E
-# define SSL3_CK_DH_RSA_DES_64_CBC_SHA           0x0300000F
-# define SSL3_CK_DH_RSA_DES_192_CBC3_SHA         0x03000010
+#define SSL3_CK_DH_DSS_DES_40_CBC_SHA 0x0300000B
+#define SSL3_CK_DH_DSS_DES_64_CBC_SHA 0x0300000C
+#define SSL3_CK_DH_DSS_DES_192_CBC3_SHA 0x0300000D
+#define SSL3_CK_DH_RSA_DES_40_CBC_SHA 0x0300000E
+#define SSL3_CK_DH_RSA_DES_64_CBC_SHA 0x0300000F
+#define SSL3_CK_DH_RSA_DES_192_CBC3_SHA 0x03000010
 
-# define SSL3_CK_DHE_DSS_DES_40_CBC_SHA          0x03000011
-# define SSL3_CK_EDH_DSS_DES_40_CBC_SHA          SSL3_CK_DHE_DSS_DES_40_CBC_SHA
-# define SSL3_CK_DHE_DSS_DES_64_CBC_SHA          0x03000012
-# define SSL3_CK_EDH_DSS_DES_64_CBC_SHA          SSL3_CK_DHE_DSS_DES_64_CBC_SHA
-# define SSL3_CK_DHE_DSS_DES_192_CBC3_SHA        0x03000013
-# define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA        SSL3_CK_DHE_DSS_DES_192_CBC3_SHA
-# define SSL3_CK_DHE_RSA_DES_40_CBC_SHA          0x03000014
-# define SSL3_CK_EDH_RSA_DES_40_CBC_SHA          SSL3_CK_DHE_RSA_DES_40_CBC_SHA
-# define SSL3_CK_DHE_RSA_DES_64_CBC_SHA          0x03000015
-# define SSL3_CK_EDH_RSA_DES_64_CBC_SHA          SSL3_CK_DHE_RSA_DES_64_CBC_SHA
-# define SSL3_CK_DHE_RSA_DES_192_CBC3_SHA        0x03000016
-# define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA        SSL3_CK_DHE_RSA_DES_192_CBC3_SHA
+#define SSL3_CK_DHE_DSS_DES_40_CBC_SHA 0x03000011
+#define SSL3_CK_EDH_DSS_DES_40_CBC_SHA SSL3_CK_DHE_DSS_DES_40_CBC_SHA
+#define SSL3_CK_DHE_DSS_DES_64_CBC_SHA 0x03000012
+#define SSL3_CK_EDH_DSS_DES_64_CBC_SHA SSL3_CK_DHE_DSS_DES_64_CBC_SHA
+#define SSL3_CK_DHE_DSS_DES_192_CBC3_SHA 0x03000013
+#define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA SSL3_CK_DHE_DSS_DES_192_CBC3_SHA
+#define SSL3_CK_DHE_RSA_DES_40_CBC_SHA 0x03000014
+#define SSL3_CK_EDH_RSA_DES_40_CBC_SHA SSL3_CK_DHE_RSA_DES_40_CBC_SHA
+#define SSL3_CK_DHE_RSA_DES_64_CBC_SHA 0x03000015
+#define SSL3_CK_EDH_RSA_DES_64_CBC_SHA SSL3_CK_DHE_RSA_DES_64_CBC_SHA
+#define SSL3_CK_DHE_RSA_DES_192_CBC3_SHA 0x03000016
+#define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA SSL3_CK_DHE_RSA_DES_192_CBC3_SHA
 
-# define SSL3_CK_ADH_RC4_40_MD5                  0x03000017
-# define SSL3_CK_ADH_RC4_128_MD5                 0x03000018
-# define SSL3_CK_ADH_DES_40_CBC_SHA              0x03000019
-# define SSL3_CK_ADH_DES_64_CBC_SHA              0x0300001A
-# define SSL3_CK_ADH_DES_192_CBC_SHA             0x0300001B
+#define SSL3_CK_ADH_RC4_40_MD5 0x03000017
+#define SSL3_CK_ADH_RC4_128_MD5 0x03000018
+#define SSL3_CK_ADH_DES_40_CBC_SHA 0x03000019
+#define SSL3_CK_ADH_DES_64_CBC_SHA 0x0300001A
+#define SSL3_CK_ADH_DES_192_CBC_SHA 0x0300001B
 
 /* a bundle of RFC standard cipher names, generated from ssl3_ciphers[] */
-# define SSL3_RFC_RSA_NULL_MD5                   "TLS_RSA_WITH_NULL_MD5"
-# define SSL3_RFC_RSA_NULL_SHA                   "TLS_RSA_WITH_NULL_SHA"
-# define SSL3_RFC_RSA_DES_192_CBC3_SHA           "TLS_RSA_WITH_3DES_EDE_CBC_SHA"
-# define SSL3_RFC_DHE_DSS_DES_192_CBC3_SHA       "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
-# define SSL3_RFC_DHE_RSA_DES_192_CBC3_SHA       "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
-# define SSL3_RFC_ADH_DES_192_CBC_SHA            "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA"
-# define SSL3_RFC_RSA_IDEA_128_SHA               "TLS_RSA_WITH_IDEA_CBC_SHA"
-# define SSL3_RFC_RSA_RC4_128_MD5                "TLS_RSA_WITH_RC4_128_MD5"
-# define SSL3_RFC_RSA_RC4_128_SHA                "TLS_RSA_WITH_RC4_128_SHA"
-# define SSL3_RFC_ADH_RC4_128_MD5                "TLS_DH_anon_WITH_RC4_128_MD5"
+#define SSL3_RFC_RSA_NULL_MD5 "TLS_RSA_WITH_NULL_MD5"
+#define SSL3_RFC_RSA_NULL_SHA "TLS_RSA_WITH_NULL_SHA"
+#define SSL3_RFC_RSA_DES_192_CBC3_SHA "TLS_RSA_WITH_3DES_EDE_CBC_SHA"
+#define SSL3_RFC_DHE_DSS_DES_192_CBC3_SHA "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA"
+#define SSL3_RFC_DHE_RSA_DES_192_CBC3_SHA "TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA"
+#define SSL3_RFC_ADH_DES_192_CBC_SHA "TLS_DH_anon_WITH_3DES_EDE_CBC_SHA"
+#define SSL3_RFC_RSA_IDEA_128_SHA "TLS_RSA_WITH_IDEA_CBC_SHA"
+#define SSL3_RFC_RSA_RC4_128_MD5 "TLS_RSA_WITH_RC4_128_MD5"
+#define SSL3_RFC_RSA_RC4_128_SHA "TLS_RSA_WITH_RC4_128_SHA"
+#define SSL3_RFC_ADH_RC4_128_MD5 "TLS_DH_anon_WITH_RC4_128_MD5"
 
-# define SSL3_TXT_RSA_NULL_MD5                   "NULL-MD5"
-# define SSL3_TXT_RSA_NULL_SHA                   "NULL-SHA"
-# define SSL3_TXT_RSA_RC4_40_MD5                 "EXP-RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_MD5                "RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_SHA                "RC4-SHA"
-# define SSL3_TXT_RSA_RC2_40_MD5                 "EXP-RC2-CBC-MD5"
-# define SSL3_TXT_RSA_IDEA_128_SHA               "IDEA-CBC-SHA"
-# define SSL3_TXT_RSA_DES_40_CBC_SHA             "EXP-DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_64_CBC_SHA             "DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_192_CBC3_SHA           "DES-CBC3-SHA"
+#define SSL3_TXT_RSA_NULL_MD5 "NULL-MD5"
+#define SSL3_TXT_RSA_NULL_SHA "NULL-SHA"
+#define SSL3_TXT_RSA_RC4_40_MD5 "EXP-RC4-MD5"
+#define SSL3_TXT_RSA_RC4_128_MD5 "RC4-MD5"
+#define SSL3_TXT_RSA_RC4_128_SHA "RC4-SHA"
+#define SSL3_TXT_RSA_RC2_40_MD5 "EXP-RC2-CBC-MD5"
+#define SSL3_TXT_RSA_IDEA_128_SHA "IDEA-CBC-SHA"
+#define SSL3_TXT_RSA_DES_40_CBC_SHA "EXP-DES-CBC-SHA"
+#define SSL3_TXT_RSA_DES_64_CBC_SHA "DES-CBC-SHA"
+#define SSL3_TXT_RSA_DES_192_CBC3_SHA "DES-CBC3-SHA"
 
-# define SSL3_TXT_DH_DSS_DES_40_CBC_SHA          "EXP-DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_64_CBC_SHA          "DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA        "DH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DH_RSA_DES_40_CBC_SHA          "EXP-DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_64_CBC_SHA          "DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA        "DH-RSA-DES-CBC3-SHA"
+#define SSL3_TXT_DH_DSS_DES_40_CBC_SHA "EXP-DH-DSS-DES-CBC-SHA"
+#define SSL3_TXT_DH_DSS_DES_64_CBC_SHA "DH-DSS-DES-CBC-SHA"
+#define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA "DH-DSS-DES-CBC3-SHA"
+#define SSL3_TXT_DH_RSA_DES_40_CBC_SHA "EXP-DH-RSA-DES-CBC-SHA"
+#define SSL3_TXT_DH_RSA_DES_64_CBC_SHA "DH-RSA-DES-CBC-SHA"
+#define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA "DH-RSA-DES-CBC3-SHA"
 
-# define SSL3_TXT_DHE_DSS_DES_40_CBC_SHA         "EXP-DHE-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DHE_DSS_DES_64_CBC_SHA         "DHE-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DHE_DSS_DES_192_CBC3_SHA       "DHE-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DHE_RSA_DES_40_CBC_SHA         "EXP-DHE-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DHE_RSA_DES_64_CBC_SHA         "DHE-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DHE_RSA_DES_192_CBC3_SHA       "DHE-RSA-DES-CBC3-SHA"
+#define SSL3_TXT_DHE_DSS_DES_40_CBC_SHA "EXP-DHE-DSS-DES-CBC-SHA"
+#define SSL3_TXT_DHE_DSS_DES_64_CBC_SHA "DHE-DSS-DES-CBC-SHA"
+#define SSL3_TXT_DHE_DSS_DES_192_CBC3_SHA "DHE-DSS-DES-CBC3-SHA"
+#define SSL3_TXT_DHE_RSA_DES_40_CBC_SHA "EXP-DHE-RSA-DES-CBC-SHA"
+#define SSL3_TXT_DHE_RSA_DES_64_CBC_SHA "DHE-RSA-DES-CBC-SHA"
+#define SSL3_TXT_DHE_RSA_DES_192_CBC3_SHA "DHE-RSA-DES-CBC3-SHA"
 
 /*
  * This next block of six "EDH" labels is for backward compatibility with
  * older versions of OpenSSL.  New code should use the six "DHE" labels above
  * instead:
  */
-# define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA         "EXP-EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA         "EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA       "EDH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA         "EXP-EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA         "EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA       "EDH-RSA-DES-CBC3-SHA"
+#define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA "EXP-EDH-DSS-DES-CBC-SHA"
+#define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA "EDH-DSS-DES-CBC-SHA"
+#define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA "EDH-DSS-DES-CBC3-SHA"
+#define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA "EXP-EDH-RSA-DES-CBC-SHA"
+#define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA "EDH-RSA-DES-CBC-SHA"
+#define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA "EDH-RSA-DES-CBC3-SHA"
 
-# define SSL3_TXT_ADH_RC4_40_MD5                 "EXP-ADH-RC4-MD5"
-# define SSL3_TXT_ADH_RC4_128_MD5                "ADH-RC4-MD5"
-# define SSL3_TXT_ADH_DES_40_CBC_SHA             "EXP-ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_64_CBC_SHA             "ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_192_CBC_SHA            "ADH-DES-CBC3-SHA"
+#define SSL3_TXT_ADH_RC4_40_MD5 "EXP-ADH-RC4-MD5"
+#define SSL3_TXT_ADH_RC4_128_MD5 "ADH-RC4-MD5"
+#define SSL3_TXT_ADH_DES_40_CBC_SHA "EXP-ADH-DES-CBC-SHA"
+#define SSL3_TXT_ADH_DES_64_CBC_SHA "ADH-DES-CBC-SHA"
+#define SSL3_TXT_ADH_DES_192_CBC_SHA "ADH-DES-CBC3-SHA"
 
-# define SSL3_SSL_SESSION_ID_LENGTH              32
-# define SSL3_MAX_SSL_SESSION_ID_LENGTH          32
+#define SSL3_SSL_SESSION_ID_LENGTH 32
+#define SSL3_MAX_SSL_SESSION_ID_LENGTH 32
 
-# define SSL3_MASTER_SECRET_SIZE                 48
-# define SSL3_RANDOM_SIZE                        32
-# define SSL3_SESSION_ID_SIZE                    32
-# define SSL3_RT_HEADER_LENGTH                   5
+#define SSL3_MASTER_SECRET_SIZE 48
+#define SSL3_RANDOM_SIZE 32
+#define SSL3_SESSION_ID_SIZE 32
+#define SSL3_RT_HEADER_LENGTH 5
 
-# define SSL3_HM_HEADER_LENGTH                  4
+#define SSL3_HM_HEADER_LENGTH 4
 
-# ifndef SSL3_ALIGN_PAYLOAD
- /*
-  * Some will argue that this increases memory footprint, but it's not
-  * actually true. Point is that malloc has to return at least 64-bit aligned
-  * pointers, meaning that allocating 5 bytes wastes 3 bytes in either case.
-  * Suggested pre-gaping simply moves these wasted bytes from the end of
-  * allocated region to its front, but makes data payload aligned, which
-  * improves performance:-)
-  */
-#  define SSL3_ALIGN_PAYLOAD                     8
-# else
-#  if (SSL3_ALIGN_PAYLOAD&(SSL3_ALIGN_PAYLOAD-1))!=0
-#   error "insane SSL3_ALIGN_PAYLOAD"
-#   undef SSL3_ALIGN_PAYLOAD
-#  endif
-# endif
+#ifndef SSL3_ALIGN_PAYLOAD
+/*
+ * Some will argue that this increases memory footprint, but it's not
+ * actually true. Point is that malloc has to return at least 64-bit aligned
+ * pointers, meaning that allocating 5 bytes wastes 3 bytes in either case.
+ * Suggested pre-gaping simply moves these wasted bytes from the end of
+ * allocated region to its front, but makes data payload aligned, which
+ * improves performance:-)
+ */
+#define SSL3_ALIGN_PAYLOAD 8
+#else
+#if (SSL3_ALIGN_PAYLOAD & (SSL3_ALIGN_PAYLOAD - 1)) != 0
+#error "insane SSL3_ALIGN_PAYLOAD"
+#undef SSL3_ALIGN_PAYLOAD
+#endif
+#endif
 
 /*
  * This is the maximum MAC (digest) size used by the SSL library. Currently
@@ -163,196 +163,195 @@ extern "C" {
  * 512-bit hashes.
  */
 
-# define SSL3_RT_MAX_MD_SIZE                     64
+#define SSL3_RT_MAX_MD_SIZE 64
 
 /*
  * Maximum block size used in all ciphersuites. Currently 16 for AES.
  */
 
-# define SSL_RT_MAX_CIPHER_BLOCK_SIZE            16
+#define SSL_RT_MAX_CIPHER_BLOCK_SIZE 16
 
-# define SSL3_RT_MAX_EXTRA                       (16384)
+#define SSL3_RT_MAX_EXTRA (16384)
 
 /* Maximum plaintext length: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_PLAIN_LENGTH                16384
+#define SSL3_RT_MAX_PLAIN_LENGTH 16384
 /* Maximum compression overhead: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_COMPRESSED_OVERHEAD         1024
+#define SSL3_RT_MAX_COMPRESSED_OVERHEAD 1024
 
 /*
  * The standards give a maximum encryption overhead of 1024 bytes. In
  * practice the value is lower than this. The overhead is the maximum number
  * of padding bytes (256) plus the mac size.
  */
-# define SSL3_RT_MAX_ENCRYPTED_OVERHEAD        (256 + SSL3_RT_MAX_MD_SIZE)
-# define SSL3_RT_MAX_TLS13_ENCRYPTED_OVERHEAD  256
+#define SSL3_RT_MAX_ENCRYPTED_OVERHEAD (256 + SSL3_RT_MAX_MD_SIZE)
+#define SSL3_RT_MAX_TLS13_ENCRYPTED_OVERHEAD 256
 
 /*
  * OpenSSL currently only uses a padding length of at most one block so the
  * send overhead is smaller.
  */
 
-# define SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                        (SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE)
+#define SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
+    (SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE)
 
 /* If compression isn't used don't include the compression overhead */
 
-# ifdef OPENSSL_NO_COMP
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH           SSL3_RT_MAX_PLAIN_LENGTH
-# else
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH   \
-            (SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-# endif
-# define SSL3_RT_MAX_ENCRYPTED_LENGTH    \
-            (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH)
-# define SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH \
-            (SSL3_RT_MAX_PLAIN_LENGTH + SSL3_RT_MAX_TLS13_ENCRYPTED_OVERHEAD)
-# define SSL3_RT_MAX_PACKET_SIZE         \
-            (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
+#ifdef OPENSSL_NO_COMP
+#define SSL3_RT_MAX_COMPRESSED_LENGTH SSL3_RT_MAX_PLAIN_LENGTH
+#else
+#define SSL3_RT_MAX_COMPRESSED_LENGTH \
+    (SSL3_RT_MAX_PLAIN_LENGTH + SSL3_RT_MAX_COMPRESSED_OVERHEAD)
+#endif
+#define SSL3_RT_MAX_ENCRYPTED_LENGTH \
+    (SSL3_RT_MAX_ENCRYPTED_OVERHEAD + SSL3_RT_MAX_COMPRESSED_LENGTH)
+#define SSL3_RT_MAX_TLS13_ENCRYPTED_LENGTH \
+    (SSL3_RT_MAX_PLAIN_LENGTH + SSL3_RT_MAX_TLS13_ENCRYPTED_OVERHEAD)
+#define SSL3_RT_MAX_PACKET_SIZE \
+    (SSL3_RT_MAX_ENCRYPTED_LENGTH + SSL3_RT_HEADER_LENGTH)
 
-# define SSL3_MD_CLIENT_FINISHED_CONST   "\x43\x4C\x4E\x54"
-# define SSL3_MD_SERVER_FINISHED_CONST   "\x53\x52\x56\x52"
+#define SSL3_MD_CLIENT_FINISHED_CONST "\x43\x4C\x4E\x54"
+#define SSL3_MD_SERVER_FINISHED_CONST "\x53\x52\x56\x52"
 
 /* SSL3_VERSION is defined in prov_ssl.h */
-# define SSL3_VERSION_MAJOR              0x03
-# define SSL3_VERSION_MINOR              0x00
+#define SSL3_VERSION_MAJOR 0x03
+#define SSL3_VERSION_MINOR 0x00
 
-# define SSL3_RT_CHANGE_CIPHER_SPEC      20
-# define SSL3_RT_ALERT                   21
-# define SSL3_RT_HANDSHAKE               22
-# define SSL3_RT_APPLICATION_DATA        23
+#define SSL3_RT_CHANGE_CIPHER_SPEC 20
+#define SSL3_RT_ALERT 21
+#define SSL3_RT_HANDSHAKE 22
+#define SSL3_RT_APPLICATION_DATA 23
 
 /* Pseudo content types to indicate additional parameters */
-# define TLS1_RT_CRYPTO                  0x1000
-# define TLS1_RT_CRYPTO_PREMASTER        (TLS1_RT_CRYPTO | 0x1)
-# define TLS1_RT_CRYPTO_CLIENT_RANDOM    (TLS1_RT_CRYPTO | 0x2)
-# define TLS1_RT_CRYPTO_SERVER_RANDOM    (TLS1_RT_CRYPTO | 0x3)
-# define TLS1_RT_CRYPTO_MASTER           (TLS1_RT_CRYPTO | 0x4)
+#define TLS1_RT_CRYPTO 0x1000
+#define TLS1_RT_CRYPTO_PREMASTER (TLS1_RT_CRYPTO | 0x1)
+#define TLS1_RT_CRYPTO_CLIENT_RANDOM (TLS1_RT_CRYPTO | 0x2)
+#define TLS1_RT_CRYPTO_SERVER_RANDOM (TLS1_RT_CRYPTO | 0x3)
+#define TLS1_RT_CRYPTO_MASTER (TLS1_RT_CRYPTO | 0x4)
 
-# define TLS1_RT_CRYPTO_READ             0x0000
-# define TLS1_RT_CRYPTO_WRITE            0x0100
-# define TLS1_RT_CRYPTO_MAC              (TLS1_RT_CRYPTO | 0x5)
-# define TLS1_RT_CRYPTO_KEY              (TLS1_RT_CRYPTO | 0x6)
-# define TLS1_RT_CRYPTO_IV               (TLS1_RT_CRYPTO | 0x7)
-# define TLS1_RT_CRYPTO_FIXED_IV         (TLS1_RT_CRYPTO | 0x8)
+#define TLS1_RT_CRYPTO_READ 0x0000
+#define TLS1_RT_CRYPTO_WRITE 0x0100
+#define TLS1_RT_CRYPTO_MAC (TLS1_RT_CRYPTO | 0x5)
+#define TLS1_RT_CRYPTO_KEY (TLS1_RT_CRYPTO | 0x6)
+#define TLS1_RT_CRYPTO_IV (TLS1_RT_CRYPTO | 0x7)
+#define TLS1_RT_CRYPTO_FIXED_IV (TLS1_RT_CRYPTO | 0x8)
 
 /* Pseudo content types for SSL/TLS header info */
-# define SSL3_RT_HEADER                  0x100
-# define SSL3_RT_INNER_CONTENT_TYPE      0x101
+#define SSL3_RT_HEADER 0x100
+#define SSL3_RT_INNER_CONTENT_TYPE 0x101
 
 /* Pseudo content types for QUIC */
-# define SSL3_RT_QUIC_DATAGRAM            0x200
-# define SSL3_RT_QUIC_PACKET              0x201
-# define SSL3_RT_QUIC_FRAME_FULL          0x202
-# define SSL3_RT_QUIC_FRAME_HEADER        0x203
-# define SSL3_RT_QUIC_FRAME_PADDING       0x204
-
-# define SSL3_AL_WARNING                 1
-# define SSL3_AL_FATAL                   2
+#define SSL3_RT_QUIC_DATAGRAM 0x200
+#define SSL3_RT_QUIC_PACKET 0x201
+#define SSL3_RT_QUIC_FRAME_FULL 0x202
+#define SSL3_RT_QUIC_FRAME_HEADER 0x203
+#define SSL3_RT_QUIC_FRAME_PADDING 0x204
 
-# define SSL3_AD_CLOSE_NOTIFY             0
-# define SSL3_AD_UNEXPECTED_MESSAGE      10/* fatal */
-# define SSL3_AD_BAD_RECORD_MAC          20/* fatal */
-# define SSL3_AD_DECOMPRESSION_FAILURE   30/* fatal */
-# define SSL3_AD_HANDSHAKE_FAILURE       40/* fatal */
-# define SSL3_AD_NO_CERTIFICATE          41
-# define SSL3_AD_BAD_CERTIFICATE         42
-# define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
-# define SSL3_AD_CERTIFICATE_REVOKED     44
-# define SSL3_AD_CERTIFICATE_EXPIRED     45
-# define SSL3_AD_CERTIFICATE_UNKNOWN     46
-# define SSL3_AD_ILLEGAL_PARAMETER       47/* fatal */
+#define SSL3_AL_WARNING 1
+#define SSL3_AL_FATAL 2
 
-# define TLS1_HB_REQUEST         1
-# define TLS1_HB_RESPONSE        2
+#define SSL3_AD_CLOSE_NOTIFY 0
+#define SSL3_AD_UNEXPECTED_MESSAGE 10 /* fatal */
+#define SSL3_AD_BAD_RECORD_MAC 20 /* fatal */
+#define SSL3_AD_DECOMPRESSION_FAILURE 30 /* fatal */
+#define SSL3_AD_HANDSHAKE_FAILURE 40 /* fatal */
+#define SSL3_AD_NO_CERTIFICATE 41
+#define SSL3_AD_BAD_CERTIFICATE 42
+#define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
+#define SSL3_AD_CERTIFICATE_REVOKED 44
+#define SSL3_AD_CERTIFICATE_EXPIRED 45
+#define SSL3_AD_CERTIFICATE_UNKNOWN 46
+#define SSL3_AD_ILLEGAL_PARAMETER 47 /* fatal */
 
+#define TLS1_HB_REQUEST 1
+#define TLS1_HB_RESPONSE 2
 
-# define SSL3_CT_RSA_SIGN                        1
-# define SSL3_CT_DSS_SIGN                        2
-# define SSL3_CT_RSA_FIXED_DH                    3
-# define SSL3_CT_DSS_FIXED_DH                    4
-# define SSL3_CT_RSA_EPHEMERAL_DH                5
-# define SSL3_CT_DSS_EPHEMERAL_DH                6
-# define SSL3_CT_FORTEZZA_DMS                    20
+#define SSL3_CT_RSA_SIGN 1
+#define SSL3_CT_DSS_SIGN 2
+#define SSL3_CT_RSA_FIXED_DH 3
+#define SSL3_CT_DSS_FIXED_DH 4
+#define SSL3_CT_RSA_EPHEMERAL_DH 5
+#define SSL3_CT_DSS_EPHEMERAL_DH 6
+#define SSL3_CT_FORTEZZA_DMS 20
 /*
  * SSL3_CT_NUMBER is used to size arrays and it must be large enough to
  * contain all of the cert types defined for *either* SSLv3 and TLSv1.
  */
-# define SSL3_CT_NUMBER                  12
+#define SSL3_CT_NUMBER 12
 
-# if defined(TLS_CT_NUMBER)
-#  if TLS_CT_NUMBER != SSL3_CT_NUMBER
-#    error "SSL/TLS CT_NUMBER values do not match"
-#  endif
-# endif
+#if defined(TLS_CT_NUMBER)
+#if TLS_CT_NUMBER != SSL3_CT_NUMBER
+#error "SSL/TLS CT_NUMBER values do not match"
+#endif
+#endif
 
 /* No longer used as of OpenSSL 1.1.1 */
-# define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS       0x0001
+#define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS 0x0001
 
 /* Removed from OpenSSL 1.1.0 */
-# define TLS1_FLAGS_TLS_PADDING_BUG              0x0
+#define TLS1_FLAGS_TLS_PADDING_BUG 0x0
 
-# define TLS1_FLAGS_SKIP_CERT_VERIFY             0x0010
+#define TLS1_FLAGS_SKIP_CERT_VERIFY 0x0010
 
 /* Set if we encrypt then mac instead of usual mac then encrypt */
-# define TLS1_FLAGS_ENCRYPT_THEN_MAC_READ        0x0100
-# define TLS1_FLAGS_ENCRYPT_THEN_MAC             TLS1_FLAGS_ENCRYPT_THEN_MAC_READ
+#define TLS1_FLAGS_ENCRYPT_THEN_MAC_READ 0x0100
+#define TLS1_FLAGS_ENCRYPT_THEN_MAC TLS1_FLAGS_ENCRYPT_THEN_MAC_READ
 
 /* Set if extended master secret extension received from peer */
-# define TLS1_FLAGS_RECEIVED_EXTMS               0x0200
+#define TLS1_FLAGS_RECEIVED_EXTMS 0x0200
 
-# define TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE       0x0400
+#define TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE 0x0400
 
-# define TLS1_FLAGS_STATELESS                    0x0800
+#define TLS1_FLAGS_STATELESS 0x0800
 
 /* Set if extended master secret extension required on renegotiation */
-# define TLS1_FLAGS_REQUIRED_EXTMS               0x1000
+#define TLS1_FLAGS_REQUIRED_EXTMS 0x1000
 
 /* 0x2000 is reserved for TLS1_FLAGS_QUIC (internal) */
 /* 0x4000 is reserved for TLS1_FLAGS_QUIC_INTERNAL (internal) */
 
-# define SSL3_MT_HELLO_REQUEST                   0
-# define SSL3_MT_CLIENT_HELLO                    1
-# define SSL3_MT_SERVER_HELLO                    2
-# define SSL3_MT_NEWSESSION_TICKET               4
-# define SSL3_MT_END_OF_EARLY_DATA               5
-# define SSL3_MT_ENCRYPTED_EXTENSIONS            8
-# define SSL3_MT_CERTIFICATE                     11
-# define SSL3_MT_SERVER_KEY_EXCHANGE             12
-# define SSL3_MT_CERTIFICATE_REQUEST             13
-# define SSL3_MT_SERVER_DONE                     14
-# define SSL3_MT_CERTIFICATE_VERIFY              15
-# define SSL3_MT_CLIENT_KEY_EXCHANGE             16
-# define SSL3_MT_FINISHED                        20
-# define SSL3_MT_CERTIFICATE_URL                 21
-# define SSL3_MT_CERTIFICATE_STATUS              22
-# define SSL3_MT_SUPPLEMENTAL_DATA               23
-# define SSL3_MT_KEY_UPDATE                      24
-# define SSL3_MT_COMPRESSED_CERTIFICATE          25
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_MT_NEXT_PROTO                     67
-# endif
-# define SSL3_MT_MESSAGE_HASH                    254
-# define DTLS1_MT_HELLO_VERIFY_REQUEST           3
+#define SSL3_MT_HELLO_REQUEST 0
+#define SSL3_MT_CLIENT_HELLO 1
+#define SSL3_MT_SERVER_HELLO 2
+#define SSL3_MT_NEWSESSION_TICKET 4
+#define SSL3_MT_END_OF_EARLY_DATA 5
+#define SSL3_MT_ENCRYPTED_EXTENSIONS 8
+#define SSL3_MT_CERTIFICATE 11
+#define SSL3_MT_SERVER_KEY_EXCHANGE 12
+#define SSL3_MT_CERTIFICATE_REQUEST 13
+#define SSL3_MT_SERVER_DONE 14
+#define SSL3_MT_CERTIFICATE_VERIFY 15
+#define SSL3_MT_CLIENT_KEY_EXCHANGE 16
+#define SSL3_MT_FINISHED 20
+#define SSL3_MT_CERTIFICATE_URL 21
+#define SSL3_MT_CERTIFICATE_STATUS 22
+#define SSL3_MT_SUPPLEMENTAL_DATA 23
+#define SSL3_MT_KEY_UPDATE 24
+#define SSL3_MT_COMPRESSED_CERTIFICATE 25
+#ifndef OPENSSL_NO_NEXTPROTONEG
+#define SSL3_MT_NEXT_PROTO 67
+#endif
+#define SSL3_MT_MESSAGE_HASH 254
+#define DTLS1_MT_HELLO_VERIFY_REQUEST 3
 
 /* Dummy message type for handling CCS like a normal handshake message */
-# define SSL3_MT_CHANGE_CIPHER_SPEC              0x0101
+#define SSL3_MT_CHANGE_CIPHER_SPEC 0x0101
 
-# define SSL3_MT_CCS                             1
+#define SSL3_MT_CCS 1
 
 /* These are used when changing over to a new cipher */
-# define SSL3_CC_READ            0x001
-# define SSL3_CC_WRITE           0x002
-# define SSL3_CC_CLIENT          0x010
-# define SSL3_CC_SERVER          0x020
-# define SSL3_CC_EARLY           0x040
-# define SSL3_CC_HANDSHAKE       0x080
-# define SSL3_CC_APPLICATION     0x100
-# define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)
-# define SSL3_CHANGE_CIPHER_SERVER_READ  (SSL3_CC_SERVER|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_CLIENT_READ  (SSL3_CC_CLIENT|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
+#define SSL3_CC_READ 0x001
+#define SSL3_CC_WRITE 0x002
+#define SSL3_CC_CLIENT 0x010
+#define SSL3_CC_SERVER 0x020
+#define SSL3_CC_EARLY 0x040
+#define SSL3_CC_HANDSHAKE 0x080
+#define SSL3_CC_APPLICATION 0x100
+#define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT | SSL3_CC_WRITE)
+#define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER | SSL3_CC_READ)
+#define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT | SSL3_CC_READ)
+#define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER | SSL3_CC_WRITE)
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index 53e0decbe676..6993255b199f 100644
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -9,374 +9,372 @@
  */
 
 #ifndef OPENSSL_SSLERR_H
-# define OPENSSL_SSLERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/sslerr_legacy.h>
-
+#define OPENSSL_SSLERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/sslerr_legacy.h>
 
 /*
  * SSL reason codes.
  */
-# define SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY        291
-# define SSL_R_APP_DATA_IN_HANDSHAKE                      100
-# define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-# define SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE     158
-# define SSL_R_BAD_CERTIFICATE                            348
-# define SSL_R_BAD_CHANGE_CIPHER_SPEC                     103
-# define SSL_R_BAD_CIPHER                                 186
-# define SSL_R_BAD_COMPRESSION_ALGORITHM                  326
-# define SSL_R_BAD_DATA                                   390
-# define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
-# define SSL_R_BAD_DECOMPRESSION                          107
-# define SSL_R_BAD_DH_VALUE                               102
-# define SSL_R_BAD_DIGEST_LENGTH                          111
-# define SSL_R_BAD_EARLY_DATA                             233
-# define SSL_R_BAD_ECC_CERT                               304
-# define SSL_R_BAD_ECPOINT                                306
-# define SSL_R_BAD_EXTENSION                              110
-# define SSL_R_BAD_HANDSHAKE_LENGTH                       332
-# define SSL_R_BAD_HANDSHAKE_STATE                        236
-# define SSL_R_BAD_HELLO_REQUEST                          105
-# define SSL_R_BAD_HRR_VERSION                            263
-# define SSL_R_BAD_KEY_SHARE                              108
-# define SSL_R_BAD_KEY_UPDATE                             122
-# define SSL_R_BAD_LEGACY_VERSION                         292
-# define SSL_R_BAD_LENGTH                                 271
-# define SSL_R_BAD_PACKET                                 240
-# define SSL_R_BAD_PACKET_LENGTH                          115
-# define SSL_R_BAD_PROTOCOL_VERSION_NUMBER                116
-# define SSL_R_BAD_PSK                                    219
-# define SSL_R_BAD_PSK_IDENTITY                           114
-# define SSL_R_BAD_RECORD_TYPE                            443
-# define SSL_R_BAD_RSA_ENCRYPT                            119
-# define SSL_R_BAD_SIGNATURE                              123
-# define SSL_R_BAD_SRP_A_LENGTH                           347
-# define SSL_R_BAD_SRP_PARAMETERS                         371
-# define SSL_R_BAD_SRTP_MKI_VALUE                         352
-# define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST           353
-# define SSL_R_BAD_SSL_FILETYPE                           124
-# define SSL_R_BAD_VALUE                                  384
-# define SSL_R_BAD_WRITE_RETRY                            127
-# define SSL_R_BINDER_DOES_NOT_VERIFY                     253
-# define SSL_R_BIO_NOT_SET                                128
-# define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  129
-# define SSL_R_BN_LIB                                     130
-# define SSL_R_CALLBACK_FAILED                            234
-# define SSL_R_CANNOT_CHANGE_CIPHER                       109
-# define SSL_R_CANNOT_GET_GROUP_NAME                      299
-# define SSL_R_CA_DN_LENGTH_MISMATCH                      131
-# define SSL_R_CA_KEY_TOO_SMALL                           397
-# define SSL_R_CA_MD_TOO_WEAK                             398
-# define SSL_R_CCS_RECEIVED_EARLY                         133
-# define SSL_R_CERTIFICATE_VERIFY_FAILED                  134
-# define SSL_R_CERT_CB_ERROR                              377
-# define SSL_R_CERT_LENGTH_MISMATCH                       135
-# define SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED             218
-# define SSL_R_CIPHER_CODE_WRONG_LENGTH                   137
-# define SSL_R_CLIENTHELLO_TLSEXT                         226
-# define SSL_R_COMPRESSED_LENGTH_TOO_LONG                 140
-# define SSL_R_COMPRESSION_DISABLED                       343
-# define SSL_R_COMPRESSION_FAILURE                        141
-# define SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE    307
-# define SSL_R_COMPRESSION_LIBRARY_ERROR                  142
-# define SSL_R_CONNECTION_TYPE_NOT_SET                    144
-# define SSL_R_CONN_USE_ONLY                              356
-# define SSL_R_CONTEXT_NOT_DANE_ENABLED                   167
-# define SSL_R_COOKIE_GEN_CALLBACK_FAILURE                400
-# define SSL_R_COOKIE_MISMATCH                            308
-# define SSL_R_COPY_PARAMETERS_FAILED                     296
-# define SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED       206
-# define SSL_R_DANE_ALREADY_ENABLED                       172
-# define SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL            173
-# define SSL_R_DANE_NOT_ENABLED                           175
-# define SSL_R_DANE_TLSA_BAD_CERTIFICATE                  180
-# define SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE            184
-# define SSL_R_DANE_TLSA_BAD_DATA_LENGTH                  189
-# define SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH                192
-# define SSL_R_DANE_TLSA_BAD_MATCHING_TYPE                200
-# define SSL_R_DANE_TLSA_BAD_PUBLIC_KEY                   201
-# define SSL_R_DANE_TLSA_BAD_SELECTOR                     202
-# define SSL_R_DANE_TLSA_NULL_DATA                        203
-# define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              145
-# define SSL_R_DATA_LENGTH_TOO_LONG                       146
-# define SSL_R_DECRYPTION_FAILED                          147
-# define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        281
-# define SSL_R_DH_KEY_TOO_SMALL                           394
-# define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            148
-# define SSL_R_DIGEST_CHECK_FAILED                        149
-# define SSL_R_DOMAIN_USE_ONLY                            422
-# define SSL_R_DTLS_MESSAGE_TOO_BIG                       334
-# define SSL_R_DUPLICATE_COMPRESSION_ID                   309
-# define SSL_R_ECC_CERT_NOT_FOR_SIGNING                   318
-# define SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE              374
-# define SSL_R_EE_KEY_TOO_SMALL                           399
-# define SSL_R_EMPTY_RAW_PUBLIC_KEY                       349
-# define SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST         354
-# define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  150
-# define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              151
-# define SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG             419
-# define SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN             204
-# define SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE                  194
-# define SSL_R_EXCESSIVE_MESSAGE_SIZE                     152
-# define SSL_R_EXTENSION_NOT_RECEIVED                     279
-# define SSL_R_EXTRA_DATA_IN_MESSAGE                      153
-# define SSL_R_EXT_LENGTH_MISMATCH                        163
-# define SSL_R_FAILED_TO_GET_PARAMETER                    316
-# define SSL_R_FAILED_TO_INIT_ASYNC                       405
-# define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE           417
-# define SSL_R_FEATURE_NOT_RENEGOTIABLE                   413
-# define SSL_R_FRAGMENTED_CLIENT_HELLO                    401
-# define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154
-# define SSL_R_HTTPS_PROXY_REQUEST                        155
-# define SSL_R_HTTP_REQUEST                               156
-# define SSL_R_ILLEGAL_POINT_COMPRESSION                  162
-# define SSL_R_ILLEGAL_SUITEB_DIGEST                      380
-# define SSL_R_INAPPROPRIATE_FALLBACK                     373
-# define SSL_R_INCONSISTENT_COMPRESSION                   340
-# define SSL_R_INCONSISTENT_EARLY_DATA_ALPN               222
-# define SSL_R_INCONSISTENT_EARLY_DATA_SNI                231
-# define SSL_R_INCONSISTENT_EXTMS                         104
-# define SSL_R_INSUFFICIENT_SECURITY                      241
-# define SSL_R_INVALID_ALERT                              205
-# define SSL_R_INVALID_CCS_MESSAGE                        260
-# define SSL_R_INVALID_CERTIFICATE_OR_ALG                 238
-# define SSL_R_INVALID_COMMAND                            280
-# define SSL_R_INVALID_COMPRESSION_ALGORITHM              341
-# define SSL_R_INVALID_CONFIG                             283
-# define SSL_R_INVALID_CONFIGURATION_NAME                 113
-# define SSL_R_INVALID_CONTEXT                            282
-# define SSL_R_INVALID_CT_VALIDATION_TYPE                 212
-# define SSL_R_INVALID_KEY_UPDATE_TYPE                    120
-# define SSL_R_INVALID_MAX_EARLY_DATA                     174
-# define SSL_R_INVALID_NULL_CMD_NAME                      385
-# define SSL_R_INVALID_RAW_PUBLIC_KEY                     350
-# define SSL_R_INVALID_RECORD                             317
-# define SSL_R_INVALID_SEQUENCE_NUMBER                    402
-# define SSL_R_INVALID_SERVERINFO_DATA                    388
-# define SSL_R_INVALID_SESSION_ID                         999
-# define SSL_R_INVALID_SRP_USERNAME                       357
-# define SSL_R_INVALID_STATUS_RESPONSE                    328
-# define SSL_R_INVALID_TICKET_KEYS_LENGTH                 325
-# define SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED    333
-# define SSL_R_LENGTH_MISMATCH                            159
-# define SSL_R_LENGTH_TOO_LONG                            404
-# define SSL_R_LENGTH_TOO_SHORT                           160
-# define SSL_R_LIBRARY_BUG                                274
-# define SSL_R_LIBRARY_HAS_NO_CIPHERS                     161
-# define SSL_R_LISTENER_USE_ONLY                          421
-# define SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED             395
-# define SSL_R_MISSING_DSA_SIGNING_CERT                   165
-# define SSL_R_MISSING_ECDSA_SIGNING_CERT                 381
-# define SSL_R_MISSING_FATAL                              256
-# define SSL_R_MISSING_PARAMETERS                         290
-# define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION            310
-# define SSL_R_MISSING_QUIC_TLS_FUNCTIONS                 423
-# define SSL_R_MISSING_RSA_CERTIFICATE                    168
-# define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
-# define SSL_R_MISSING_RSA_SIGNING_CERT                   170
-# define SSL_R_MISSING_SIGALGS_EXTENSION                  112
-# define SSL_R_MISSING_SIGNING_CERT                       221
-# define SSL_R_MISSING_SRP_PARAM                          358
-# define SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION         209
-# define SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION       420
-# define SSL_R_MISSING_TMP_DH_KEY                         171
-# define SSL_R_MISSING_TMP_ECDH_KEY                       311
-# define SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA     293
-# define SSL_R_NOT_ON_RECORD_BOUNDARY                     182
-# define SSL_R_NOT_REPLACING_CERTIFICATE                  289
-# define SSL_R_NOT_SERVER                                 284
-# define SSL_R_NO_APPLICATION_PROTOCOL                    235
-# define SSL_R_NO_CERTIFICATES_RETURNED                   176
-# define SSL_R_NO_CERTIFICATE_ASSIGNED                    177
-# define SSL_R_NO_CERTIFICATE_SET                         179
-# define SSL_R_NO_CHANGE_FOLLOWING_HRR                    214
-# define SSL_R_NO_CIPHERS_AVAILABLE                       181
-# define SSL_R_NO_CIPHERS_SPECIFIED                       183
-# define SSL_R_NO_CIPHER_MATCH                            185
-# define SSL_R_NO_CLIENT_CERT_METHOD                      331
-# define SSL_R_NO_COMPRESSION_SPECIFIED                   187
-# define SSL_R_NO_COOKIE_CALLBACK_SET                     287
-# define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER           330
-# define SSL_R_NO_METHOD_SPECIFIED                        188
-# define SSL_R_NO_PEM_EXTENSIONS                          389
-# define SSL_R_NO_PRIVATE_KEY_ASSIGNED                    190
-# define SSL_R_NO_PROTOCOLS_AVAILABLE                     191
-# define SSL_R_NO_RENEGOTIATION                           339
-# define SSL_R_NO_REQUIRED_DIGEST                         324
-# define SSL_R_NO_SHARED_CIPHER                           193
-# define SSL_R_NO_SHARED_GROUPS                           410
-# define SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS             376
-# define SSL_R_NO_SRTP_PROFILES                           359
-# define SSL_R_NO_STREAM                                  355
-# define SSL_R_NO_SUITABLE_DIGEST_ALGORITHM               297
-# define SSL_R_NO_SUITABLE_GROUPS                         295
-# define SSL_R_NO_SUITABLE_KEY_SHARE                      101
-# define SSL_R_NO_SUITABLE_RECORD_LAYER                   322
-# define SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM            118
-# define SSL_R_NO_VALID_SCTS                              216
-# define SSL_R_NO_VERIFY_COOKIE_CALLBACK                  403
-# define SSL_R_NULL_SSL_CTX                               195
-# define SSL_R_NULL_SSL_METHOD_PASSED                     196
-# define SSL_R_OCSP_CALLBACK_FAILURE                      305
-# define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
-# define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
-# define SSL_R_OVERFLOW_ERROR                             237
-# define SSL_R_PACKET_LENGTH_TOO_LONG                     198
-# define SSL_R_PARSE_TLSEXT                               227
-# define SSL_R_PATH_TOO_LONG                              270
-# define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE          199
-# define SSL_R_PEM_NAME_BAD_PREFIX                        391
-# define SSL_R_PEM_NAME_TOO_SHORT                         392
-# define SSL_R_PIPELINE_FAILURE                           406
-# define SSL_R_POLL_REQUEST_NOT_SUPPORTED                 418
-# define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR           278
-# define SSL_R_PRIVATE_KEY_MISMATCH                       288
-# define SSL_R_PROTOCOL_IS_SHUTDOWN                       207
-# define SSL_R_PSK_IDENTITY_NOT_FOUND                     223
-# define SSL_R_PSK_NO_CLIENT_CB                           224
-# define SSL_R_PSK_NO_SERVER_CB                           225
-# define SSL_R_QUIC_HANDSHAKE_LAYER_ERROR                 393
-# define SSL_R_QUIC_NETWORK_ERROR                         387
-# define SSL_R_QUIC_PROTOCOL_ERROR                        382
-# define SSL_R_READ_BIO_NOT_SET                           211
-# define SSL_R_READ_TIMEOUT_EXPIRED                       312
-# define SSL_R_RECORDS_NOT_RELEASED                       321
-# define SSL_R_RECORD_LAYER_FAILURE                       313
-# define SSL_R_RECORD_LENGTH_MISMATCH                     213
-# define SSL_R_RECORD_TOO_SMALL                           298
-# define SSL_R_REMOTE_PEER_ADDRESS_NOT_SET                346
-# define SSL_R_RENEGOTIATE_EXT_TOO_LONG                   335
-# define SSL_R_RENEGOTIATION_ENCODING_ERR                 336
-# define SSL_R_RENEGOTIATION_MISMATCH                     337
-# define SSL_R_REQUEST_PENDING                            285
-# define SSL_R_REQUEST_SENT                               286
-# define SSL_R_REQUIRED_CIPHER_MISSING                    215
-# define SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING     342
-# define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING           345
-# define SSL_R_SCT_VERIFICATION_FAILED                    208
-# define SSL_R_SEQUENCE_CTR_WRAPPED                       327
-# define SSL_R_SERVERHELLO_TLSEXT                         275
-# define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277
-# define SSL_R_SHUTDOWN_WHILE_IN_INIT                     407
-# define SSL_R_SIGNATURE_ALGORITHMS_ERROR                 360
-# define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220
-# define SSL_R_SRP_A_CALC                                 361
-# define SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES           362
-# define SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG      363
-# define SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE            364
-# define SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH       232
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME                319
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE           320
-# define SSL_R_SSL3_SESSION_ID_TOO_LONG                   300
-# define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE                1042
-# define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC                 1020
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED            1045
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED            1044
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN            1046
-# define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE          1030
-# define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE              1040
-# define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER              1047
-# define SSL_R_SSLV3_ALERT_NO_CERTIFICATE                 1041
-# define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010
-# define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043
-# define SSL_R_SSL_COMMAND_SECTION_EMPTY                  117
-# define SSL_R_SSL_COMMAND_SECTION_NOT_FOUND              125
-# define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         228
-# define SSL_R_SSL_HANDSHAKE_FAILURE                      229
-# define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 230
-# define SSL_R_SSL_NEGATIVE_LENGTH                        372
-# define SSL_R_SSL_SECTION_EMPTY                          126
-# define SSL_R_SSL_SECTION_NOT_FOUND                      136
-# define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301
-# define SSL_R_SSL_SESSION_ID_CONFLICT                    302
-# define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
-# define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH              303
-# define SSL_R_SSL_SESSION_ID_TOO_LONG                    408
-# define SSL_R_SSL_SESSION_VERSION_MISMATCH               210
-# define SSL_R_STILL_IN_INIT                              121
-# define SSL_R_STREAM_COUNT_LIMITED                       411
-# define SSL_R_STREAM_FINISHED                            365
-# define SSL_R_STREAM_RECV_ONLY                           366
-# define SSL_R_STREAM_RESET                               375
-# define SSL_R_STREAM_SEND_ONLY                           379
-# define SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED          1116
-# define SSL_R_TLSV13_ALERT_MISSING_EXTENSION             1109
-# define SSL_R_TLSV1_ALERT_ACCESS_DENIED                  1049
-# define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050
-# define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              1021
-# define SSL_R_TLSV1_ALERT_DECRYPT_ERROR                  1051
-# define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION             1060
-# define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK         1086
-# define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          1071
-# define SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 1080
-# define SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL        1120
-# define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION               1100
-# define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION               1070
-# define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW                1022
-# define SSL_R_TLSV1_ALERT_UNKNOWN_CA                     1048
-# define SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY           1115
-# define SSL_R_TLSV1_ALERT_USER_CANCELLED                 1090
-# define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE           1114
-# define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE      1113
-# define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE             1111
-# define SSL_R_TLSV1_UNRECOGNIZED_NAME                    1112
-# define SSL_R_TLSV1_UNSUPPORTED_EXTENSION                1110
-# define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
-# define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
-# define SSL_R_TOO_MANY_KEY_UPDATES                       132
-# define SSL_R_TOO_MANY_WARN_ALERTS                       409
-# define SSL_R_TOO_MUCH_EARLY_DATA                        164
-# define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS             314
-# define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
-# define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
-# define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
-# define SSL_R_UNEXPECTED_CCS_MESSAGE                     262
-# define SSL_R_UNEXPECTED_END_OF_EARLY_DATA               178
-# define SSL_R_UNEXPECTED_EOF_WHILE_READING               294
-# define SSL_R_UNEXPECTED_MESSAGE                         244
-# define SSL_R_UNEXPECTED_RECORD                          245
-# define SSL_R_UNINITIALIZED                              276
-# define SSL_R_UNKNOWN_ALERT_TYPE                         246
-# define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   247
-# define SSL_R_UNKNOWN_CIPHER_RETURNED                    248
-# define SSL_R_UNKNOWN_CIPHER_TYPE                        249
-# define SSL_R_UNKNOWN_CMD_NAME                           386
-# define SSL_R_UNKNOWN_COMMAND                            139
-# define SSL_R_UNKNOWN_DIGEST                             368
-# define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250
-# define SSL_R_UNKNOWN_MANDATORY_PARAMETER                323
-# define SSL_R_UNKNOWN_PKEY_TYPE                          251
-# define SSL_R_UNKNOWN_PROTOCOL                           252
-# define SSL_R_UNKNOWN_SSL_VERSION                        254
-# define SSL_R_UNKNOWN_STATE                              255
-# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED       338
-# define SSL_R_UNSOLICITED_EXTENSION                      217
-# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM          257
-# define SSL_R_UNSUPPORTED_CONFIG_VALUE                   414
-# define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS             415
-# define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP                416
-# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE                 315
-# define SSL_R_UNSUPPORTED_PROTOCOL                       258
-# define SSL_R_UNSUPPORTED_SSL_VERSION                    259
-# define SSL_R_UNSUPPORTED_STATUS_TYPE                    329
-# define SSL_R_UNSUPPORTED_WRITE_FLAG                     412
-# define SSL_R_USE_SRTP_NOT_NEGOTIATED                    369
-# define SSL_R_VERSION_TOO_HIGH                           166
-# define SSL_R_VERSION_TOO_LOW                            396
-# define SSL_R_WRONG_CERTIFICATE_TYPE                     383
-# define SSL_R_WRONG_CIPHER_RETURNED                      261
-# define SSL_R_WRONG_CURVE                                378
-# define SSL_R_WRONG_RPK_TYPE                             351
-# define SSL_R_WRONG_SIGNATURE_LENGTH                     264
-# define SSL_R_WRONG_SIGNATURE_SIZE                       265
-# define SSL_R_WRONG_SIGNATURE_TYPE                       370
-# define SSL_R_WRONG_SSL_VERSION                          266
-# define SSL_R_WRONG_VERSION_NUMBER                       267
-# define SSL_R_X509_LIB                                   268
-# define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
+#define SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY 291
+#define SSL_R_APP_DATA_IN_HANDSHAKE 100
+#define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
+#define SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE 158
+#define SSL_R_BAD_CERTIFICATE 348
+#define SSL_R_BAD_CHANGE_CIPHER_SPEC 103
+#define SSL_R_BAD_CIPHER 186
+#define SSL_R_BAD_COMPRESSION_ALGORITHM 326
+#define SSL_R_BAD_DATA 390
+#define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK 106
+#define SSL_R_BAD_DECOMPRESSION 107
+#define SSL_R_BAD_DH_VALUE 102
+#define SSL_R_BAD_DIGEST_LENGTH 111
+#define SSL_R_BAD_EARLY_DATA 233
+#define SSL_R_BAD_ECC_CERT 304
+#define SSL_R_BAD_ECPOINT 306
+#define SSL_R_BAD_EXTENSION 110
+#define SSL_R_BAD_HANDSHAKE_LENGTH 332
+#define SSL_R_BAD_HANDSHAKE_STATE 236
+#define SSL_R_BAD_HELLO_REQUEST 105
+#define SSL_R_BAD_HRR_VERSION 263
+#define SSL_R_BAD_KEY_SHARE 108
+#define SSL_R_BAD_KEY_UPDATE 122
+#define SSL_R_BAD_LEGACY_VERSION 292
+#define SSL_R_BAD_LENGTH 271
+#define SSL_R_BAD_PACKET 240
+#define SSL_R_BAD_PACKET_LENGTH 115
+#define SSL_R_BAD_PROTOCOL_VERSION_NUMBER 116
+#define SSL_R_BAD_PSK 219
+#define SSL_R_BAD_PSK_IDENTITY 114
+#define SSL_R_BAD_RECORD_TYPE 443
+#define SSL_R_BAD_RSA_ENCRYPT 119
+#define SSL_R_BAD_SIGNATURE 123
+#define SSL_R_BAD_SRP_A_LENGTH 347
+#define SSL_R_BAD_SRP_PARAMETERS 371
+#define SSL_R_BAD_SRTP_MKI_VALUE 352
+#define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST 353
+#define SSL_R_BAD_SSL_FILETYPE 124
+#define SSL_R_BAD_VALUE 384
+#define SSL_R_BAD_WRITE_RETRY 127
+#define SSL_R_BINDER_DOES_NOT_VERIFY 253
+#define SSL_R_BIO_NOT_SET 128
+#define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG 129
+#define SSL_R_BN_LIB 130
+#define SSL_R_CALLBACK_FAILED 234
+#define SSL_R_CANNOT_CHANGE_CIPHER 109
+#define SSL_R_CANNOT_GET_GROUP_NAME 299
+#define SSL_R_CA_DN_LENGTH_MISMATCH 131
+#define SSL_R_CA_KEY_TOO_SMALL 397
+#define SSL_R_CA_MD_TOO_WEAK 398
+#define SSL_R_CCS_RECEIVED_EARLY 133
+#define SSL_R_CERTIFICATE_VERIFY_FAILED 134
+#define SSL_R_CERT_CB_ERROR 377
+#define SSL_R_CERT_LENGTH_MISMATCH 135
+#define SSL_R_CIPHERSUITE_DIGEST_HAS_CHANGED 218
+#define SSL_R_CIPHER_CODE_WRONG_LENGTH 137
+#define SSL_R_CLIENTHELLO_TLSEXT 226
+#define SSL_R_COMPRESSED_LENGTH_TOO_LONG 140
+#define SSL_R_COMPRESSION_DISABLED 343
+#define SSL_R_COMPRESSION_FAILURE 141
+#define SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE 307
+#define SSL_R_COMPRESSION_LIBRARY_ERROR 142
+#define SSL_R_CONNECTION_TYPE_NOT_SET 144
+#define SSL_R_CONN_USE_ONLY 356
+#define SSL_R_CONTEXT_NOT_DANE_ENABLED 167
+#define SSL_R_COOKIE_GEN_CALLBACK_FAILURE 400
+#define SSL_R_COOKIE_MISMATCH 308
+#define SSL_R_COPY_PARAMETERS_FAILED 296
+#define SSL_R_CUSTOM_EXT_HANDLER_ALREADY_INSTALLED 206
+#define SSL_R_DANE_ALREADY_ENABLED 172
+#define SSL_R_DANE_CANNOT_OVERRIDE_MTYPE_FULL 173
+#define SSL_R_DANE_NOT_ENABLED 175
+#define SSL_R_DANE_TLSA_BAD_CERTIFICATE 180
+#define SSL_R_DANE_TLSA_BAD_CERTIFICATE_USAGE 184
+#define SSL_R_DANE_TLSA_BAD_DATA_LENGTH 189
+#define SSL_R_DANE_TLSA_BAD_DIGEST_LENGTH 192
+#define SSL_R_DANE_TLSA_BAD_MATCHING_TYPE 200
+#define SSL_R_DANE_TLSA_BAD_PUBLIC_KEY 201
+#define SSL_R_DANE_TLSA_BAD_SELECTOR 202
+#define SSL_R_DANE_TLSA_NULL_DATA 203
+#define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED 145
+#define SSL_R_DATA_LENGTH_TOO_LONG 146
+#define SSL_R_DECRYPTION_FAILED 147
+#define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC 281
+#define SSL_R_DH_KEY_TOO_SMALL 394
+#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148
+#define SSL_R_DIGEST_CHECK_FAILED 149
+#define SSL_R_DOMAIN_USE_ONLY 422
+#define SSL_R_DTLS_MESSAGE_TOO_BIG 334
+#define SSL_R_DUPLICATE_COMPRESSION_ID 309
+#define SSL_R_ECC_CERT_NOT_FOR_SIGNING 318
+#define SSL_R_ECDH_REQUIRED_FOR_SUITEB_MODE 374
+#define SSL_R_EE_KEY_TOO_SMALL 399
+#define SSL_R_EMPTY_RAW_PUBLIC_KEY 349
+#define SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST 354
+#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150
+#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151
+#define SSL_R_ERROR_IN_SYSTEM_DEFAULT_CONFIG 419
+#define SSL_R_ERROR_SETTING_TLSA_BASE_DOMAIN 204
+#define SSL_R_EXCEEDS_MAX_FRAGMENT_SIZE 194
+#define SSL_R_EXCESSIVE_MESSAGE_SIZE 152
+#define SSL_R_EXTENSION_NOT_RECEIVED 279
+#define SSL_R_EXTRA_DATA_IN_MESSAGE 153
+#define SSL_R_EXT_LENGTH_MISMATCH 163
+#define SSL_R_FAILED_TO_GET_PARAMETER 316
+#define SSL_R_FAILED_TO_INIT_ASYNC 405
+#define SSL_R_FEATURE_NEGOTIATION_NOT_COMPLETE 417
+#define SSL_R_FEATURE_NOT_RENEGOTIABLE 413
+#define SSL_R_FRAGMENTED_CLIENT_HELLO 401
+#define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
+#define SSL_R_HTTPS_PROXY_REQUEST 155
+#define SSL_R_HTTP_REQUEST 156
+#define SSL_R_ILLEGAL_POINT_COMPRESSION 162
+#define SSL_R_ILLEGAL_SUITEB_DIGEST 380
+#define SSL_R_INAPPROPRIATE_FALLBACK 373
+#define SSL_R_INCONSISTENT_COMPRESSION 340
+#define SSL_R_INCONSISTENT_EARLY_DATA_ALPN 222
+#define SSL_R_INCONSISTENT_EARLY_DATA_SNI 231
+#define SSL_R_INCONSISTENT_EXTMS 104
+#define SSL_R_INSUFFICIENT_SECURITY 241
+#define SSL_R_INVALID_ALERT 205
+#define SSL_R_INVALID_CCS_MESSAGE 260
+#define SSL_R_INVALID_CERTIFICATE_OR_ALG 238
+#define SSL_R_INVALID_COMMAND 280
+#define SSL_R_INVALID_COMPRESSION_ALGORITHM 341
+#define SSL_R_INVALID_CONFIG 283
+#define SSL_R_INVALID_CONFIGURATION_NAME 113
+#define SSL_R_INVALID_CONTEXT 282
+#define SSL_R_INVALID_CT_VALIDATION_TYPE 212
+#define SSL_R_INVALID_KEY_UPDATE_TYPE 120
+#define SSL_R_INVALID_MAX_EARLY_DATA 174
+#define SSL_R_INVALID_NULL_CMD_NAME 385
+#define SSL_R_INVALID_RAW_PUBLIC_KEY 350
+#define SSL_R_INVALID_RECORD 317
+#define SSL_R_INVALID_SEQUENCE_NUMBER 402
+#define SSL_R_INVALID_SERVERINFO_DATA 388
+#define SSL_R_INVALID_SESSION_ID 999
+#define SSL_R_INVALID_SRP_USERNAME 357
+#define SSL_R_INVALID_STATUS_RESPONSE 328
+#define SSL_R_INVALID_TICKET_KEYS_LENGTH 325
+#define SSL_R_LEGACY_SIGALG_DISALLOWED_OR_UNSUPPORTED 333
+#define SSL_R_LENGTH_MISMATCH 159
+#define SSL_R_LENGTH_TOO_LONG 404
+#define SSL_R_LENGTH_TOO_SHORT 160
+#define SSL_R_LIBRARY_BUG 274
+#define SSL_R_LIBRARY_HAS_NO_CIPHERS 161
+#define SSL_R_LISTENER_USE_ONLY 421
+#define SSL_R_MAXIMUM_ENCRYPTED_PKTS_REACHED 395
+#define SSL_R_MISSING_DSA_SIGNING_CERT 165
+#define SSL_R_MISSING_ECDSA_SIGNING_CERT 381
+#define SSL_R_MISSING_FATAL 256
+#define SSL_R_MISSING_PARAMETERS 290
+#define SSL_R_MISSING_PSK_KEX_MODES_EXTENSION 310
+#define SSL_R_MISSING_QUIC_TLS_FUNCTIONS 423
+#define SSL_R_MISSING_RSA_CERTIFICATE 168
+#define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169
+#define SSL_R_MISSING_RSA_SIGNING_CERT 170
+#define SSL_R_MISSING_SIGALGS_EXTENSION 112
+#define SSL_R_MISSING_SIGNING_CERT 221
+#define SSL_R_MISSING_SRP_PARAM 358
+#define SSL_R_MISSING_SUPPORTED_GROUPS_EXTENSION 209
+#define SSL_R_MISSING_SUPPORTED_VERSIONS_EXTENSION 420
+#define SSL_R_MISSING_TMP_DH_KEY 171
+#define SSL_R_MISSING_TMP_ECDH_KEY 311
+#define SSL_R_MIXED_HANDSHAKE_AND_NON_HANDSHAKE_DATA 293
+#define SSL_R_NOT_ON_RECORD_BOUNDARY 182
+#define SSL_R_NOT_REPLACING_CERTIFICATE 289
+#define SSL_R_NOT_SERVER 284
+#define SSL_R_NO_APPLICATION_PROTOCOL 235
+#define SSL_R_NO_CERTIFICATES_RETURNED 176
+#define SSL_R_NO_CERTIFICATE_ASSIGNED 177
+#define SSL_R_NO_CERTIFICATE_SET 179
+#define SSL_R_NO_CHANGE_FOLLOWING_HRR 214
+#define SSL_R_NO_CIPHERS_AVAILABLE 181
+#define SSL_R_NO_CIPHERS_SPECIFIED 183
+#define SSL_R_NO_CIPHER_MATCH 185
+#define SSL_R_NO_CLIENT_CERT_METHOD 331
+#define SSL_R_NO_COMPRESSION_SPECIFIED 187
+#define SSL_R_NO_COOKIE_CALLBACK_SET 287
+#define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER 330
+#define SSL_R_NO_METHOD_SPECIFIED 188
+#define SSL_R_NO_PEM_EXTENSIONS 389
+#define SSL_R_NO_PRIVATE_KEY_ASSIGNED 190
+#define SSL_R_NO_PROTOCOLS_AVAILABLE 191
+#define SSL_R_NO_RENEGOTIATION 339
+#define SSL_R_NO_REQUIRED_DIGEST 324
+#define SSL_R_NO_SHARED_CIPHER 193
+#define SSL_R_NO_SHARED_GROUPS 410
+#define SSL_R_NO_SHARED_SIGNATURE_ALGORITHMS 376
+#define SSL_R_NO_SRTP_PROFILES 359
+#define SSL_R_NO_STREAM 355
+#define SSL_R_NO_SUITABLE_DIGEST_ALGORITHM 297
+#define SSL_R_NO_SUITABLE_GROUPS 295
+#define SSL_R_NO_SUITABLE_KEY_SHARE 101
+#define SSL_R_NO_SUITABLE_RECORD_LAYER 322
+#define SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM 118
+#define SSL_R_NO_VALID_SCTS 216
+#define SSL_R_NO_VERIFY_COOKIE_CALLBACK 403
+#define SSL_R_NULL_SSL_CTX 195
+#define SSL_R_NULL_SSL_METHOD_PASSED 196
+#define SSL_R_OCSP_CALLBACK_FAILURE 305
+#define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197
+#define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
+#define SSL_R_OVERFLOW_ERROR 237
+#define SSL_R_PACKET_LENGTH_TOO_LONG 198
+#define SSL_R_PARSE_TLSEXT 227
+#define SSL_R_PATH_TOO_LONG 270
+#define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE 199
+#define SSL_R_PEM_NAME_BAD_PREFIX 391
+#define SSL_R_PEM_NAME_TOO_SHORT 392
+#define SSL_R_PIPELINE_FAILURE 406
+#define SSL_R_POLL_REQUEST_NOT_SUPPORTED 418
+#define SSL_R_POST_HANDSHAKE_AUTH_ENCODING_ERR 278
+#define SSL_R_PRIVATE_KEY_MISMATCH 288
+#define SSL_R_PROTOCOL_IS_SHUTDOWN 207
+#define SSL_R_PSK_IDENTITY_NOT_FOUND 223
+#define SSL_R_PSK_NO_CLIENT_CB 224
+#define SSL_R_PSK_NO_SERVER_CB 225
+#define SSL_R_QUIC_HANDSHAKE_LAYER_ERROR 393
+#define SSL_R_QUIC_NETWORK_ERROR 387
+#define SSL_R_QUIC_PROTOCOL_ERROR 382
+#define SSL_R_READ_BIO_NOT_SET 211
+#define SSL_R_READ_TIMEOUT_EXPIRED 312
+#define SSL_R_RECORDS_NOT_RELEASED 321
+#define SSL_R_RECORD_LAYER_FAILURE 313
+#define SSL_R_RECORD_LENGTH_MISMATCH 213
+#define SSL_R_RECORD_TOO_SMALL 298
+#define SSL_R_REMOTE_PEER_ADDRESS_NOT_SET 346
+#define SSL_R_RENEGOTIATE_EXT_TOO_LONG 335
+#define SSL_R_RENEGOTIATION_ENCODING_ERR 336
+#define SSL_R_RENEGOTIATION_MISMATCH 337
+#define SSL_R_REQUEST_PENDING 285
+#define SSL_R_REQUEST_SENT 286
+#define SSL_R_REQUIRED_CIPHER_MISSING 215
+#define SSL_R_REQUIRED_COMPRESSION_ALGORITHM_MISSING 342
+#define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING 345
+#define SSL_R_SCT_VERIFICATION_FAILED 208
+#define SSL_R_SEQUENCE_CTR_WRAPPED 327
+#define SSL_R_SERVERHELLO_TLSEXT 275
+#define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED 277
+#define SSL_R_SHUTDOWN_WHILE_IN_INIT 407
+#define SSL_R_SIGNATURE_ALGORITHMS_ERROR 360
+#define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE 220
+#define SSL_R_SRP_A_CALC 361
+#define SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES 362
+#define SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG 363
+#define SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE 364
+#define SSL_R_SSL3_EXT_INVALID_MAX_FRAGMENT_LENGTH 232
+#define SSL_R_SSL3_EXT_INVALID_SERVERNAME 319
+#define SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE 320
+#define SSL_R_SSL3_SESSION_ID_TOO_LONG 300
+#define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE 1042
+#define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC 1020
+#define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED 1045
+#define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED 1044
+#define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN 1046
+#define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE 1030
+#define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE 1040
+#define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER 1047
+#define SSL_R_SSLV3_ALERT_NO_CERTIFICATE 1041
+#define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010
+#define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE 1043
+#define SSL_R_SSL_COMMAND_SECTION_EMPTY 117
+#define SSL_R_SSL_COMMAND_SECTION_NOT_FOUND 125
+#define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION 228
+#define SSL_R_SSL_HANDSHAKE_FAILURE 229
+#define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS 230
+#define SSL_R_SSL_NEGATIVE_LENGTH 372
+#define SSL_R_SSL_SECTION_EMPTY 126
+#define SSL_R_SSL_SECTION_NOT_FOUND 136
+#define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED 301
+#define SSL_R_SSL_SESSION_ID_CONFLICT 302
+#define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273
+#define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH 303
+#define SSL_R_SSL_SESSION_ID_TOO_LONG 408
+#define SSL_R_SSL_SESSION_VERSION_MISMATCH 210
+#define SSL_R_STILL_IN_INIT 121
+#define SSL_R_STREAM_COUNT_LIMITED 411
+#define SSL_R_STREAM_FINISHED 365
+#define SSL_R_STREAM_RECV_ONLY 366
+#define SSL_R_STREAM_RESET 375
+#define SSL_R_STREAM_SEND_ONLY 379
+#define SSL_R_TLSV13_ALERT_CERTIFICATE_REQUIRED 1116
+#define SSL_R_TLSV13_ALERT_MISSING_EXTENSION 1109
+#define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049
+#define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050
+#define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021
+#define SSL_R_TLSV1_ALERT_DECRYPT_ERROR 1051
+#define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060
+#define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086
+#define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071
+#define SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080
+#define SSL_R_TLSV1_ALERT_NO_APPLICATION_PROTOCOL 1120
+#define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100
+#define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION 1070
+#define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW 1022
+#define SSL_R_TLSV1_ALERT_UNKNOWN_CA 1048
+#define SSL_R_TLSV1_ALERT_UNKNOWN_PSK_IDENTITY 1115
+#define SSL_R_TLSV1_ALERT_USER_CANCELLED 1090
+#define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE 1114
+#define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE 1113
+#define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE 1111
+#define SSL_R_TLSV1_UNRECOGNIZED_NAME 1112
+#define SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110
+#define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL 367
+#define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST 157
+#define SSL_R_TOO_MANY_KEY_UPDATES 132
+#define SSL_R_TOO_MANY_WARN_ALERTS 409
+#define SSL_R_TOO_MUCH_EARLY_DATA 164
+#define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS 314
+#define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS 239
+#define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES 242
+#define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES 243
+#define SSL_R_UNEXPECTED_CCS_MESSAGE 262
+#define SSL_R_UNEXPECTED_END_OF_EARLY_DATA 178
+#define SSL_R_UNEXPECTED_EOF_WHILE_READING 294
+#define SSL_R_UNEXPECTED_MESSAGE 244
+#define SSL_R_UNEXPECTED_RECORD 245
+#define SSL_R_UNINITIALIZED 276
+#define SSL_R_UNKNOWN_ALERT_TYPE 246
+#define SSL_R_UNKNOWN_CERTIFICATE_TYPE 247
+#define SSL_R_UNKNOWN_CIPHER_RETURNED 248
+#define SSL_R_UNKNOWN_CIPHER_TYPE 249
+#define SSL_R_UNKNOWN_CMD_NAME 386
+#define SSL_R_UNKNOWN_COMMAND 139
+#define SSL_R_UNKNOWN_DIGEST 368
+#define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE 250
+#define SSL_R_UNKNOWN_MANDATORY_PARAMETER 323
+#define SSL_R_UNKNOWN_PKEY_TYPE 251
+#define SSL_R_UNKNOWN_PROTOCOL 252
+#define SSL_R_UNKNOWN_SSL_VERSION 254
+#define SSL_R_UNKNOWN_STATE 255
+#define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED 338
+#define SSL_R_UNSOLICITED_EXTENSION 217
+#define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257
+#define SSL_R_UNSUPPORTED_CONFIG_VALUE 414
+#define SSL_R_UNSUPPORTED_CONFIG_VALUE_CLASS 415
+#define SSL_R_UNSUPPORTED_CONFIG_VALUE_OP 416
+#define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE 315
+#define SSL_R_UNSUPPORTED_PROTOCOL 258
+#define SSL_R_UNSUPPORTED_SSL_VERSION 259
+#define SSL_R_UNSUPPORTED_STATUS_TYPE 329
+#define SSL_R_UNSUPPORTED_WRITE_FLAG 412
+#define SSL_R_USE_SRTP_NOT_NEGOTIATED 369
+#define SSL_R_VERSION_TOO_HIGH 166
+#define SSL_R_VERSION_TOO_LOW 396
+#define SSL_R_WRONG_CERTIFICATE_TYPE 383
+#define SSL_R_WRONG_CIPHER_RETURNED 261
+#define SSL_R_WRONG_CURVE 378
+#define SSL_R_WRONG_RPK_TYPE 351
+#define SSL_R_WRONG_SIGNATURE_LENGTH 264
+#define SSL_R_WRONG_SIGNATURE_SIZE 265
+#define SSL_R_WRONG_SIGNATURE_TYPE 370
+#define SSL_R_WRONG_SSL_VERSION 266
+#define SSL_R_WRONG_VERSION_NUMBER 267
+#define SSL_R_X509_LIB 268
+#define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS 269
 
 #endif
diff --git a/include/openssl/sslerr_legacy.h b/include/openssl/sslerr_legacy.h
index 4c353671c7e8..8cf1ebd7b026 100644
--- a/include/openssl/sslerr_legacy.h
+++ b/include/openssl/sslerr_legacy.h
@@ -15,17 +15,17 @@
  */
 
 #ifndef OPENSSL_SSLERR_LEGACY_H
-# define OPENSSL_SSLERR_LEGACY_H
-# pragma once
+#define OPENSSL_SSLERR_LEGACY_H
+#pragma once
 
-# include <openssl/macros.h>
-# include <openssl/symhacks.h>
+#include <openssl/macros.h>
+#include <openssl/symhacks.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
 
 /* Collected _F_ macros from OpenSSL 1.1.1 */
@@ -33,435 +33,435 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
 /*
  * SSL function codes.
  */
-#  define SSL_F_ADD_CLIENT_KEY_SHARE_EXT                   0
-#  define SSL_F_ADD_KEY_SHARE                              0
-#  define SSL_F_BYTES_TO_CIPHER_LIST                       0
-#  define SSL_F_CHECK_SUITEB_CIPHER_LIST                   0
-#  define SSL_F_CIPHERSUITE_CB                             0
-#  define SSL_F_CONSTRUCT_CA_NAMES                         0
-#  define SSL_F_CONSTRUCT_KEY_EXCHANGE_TBS                 0
-#  define SSL_F_CONSTRUCT_STATEFUL_TICKET                  0
-#  define SSL_F_CONSTRUCT_STATELESS_TICKET                 0
-#  define SSL_F_CREATE_SYNTHETIC_MESSAGE_HASH              0
-#  define SSL_F_CREATE_TICKET_PREQUEL                      0
-#  define SSL_F_CT_MOVE_SCTS                               0
-#  define SSL_F_CT_STRICT                                  0
-#  define SSL_F_CUSTOM_EXT_ADD                             0
-#  define SSL_F_CUSTOM_EXT_PARSE                           0
-#  define SSL_F_D2I_SSL_SESSION                            0
-#  define SSL_F_DANE_CTX_ENABLE                            0
-#  define SSL_F_DANE_MTYPE_SET                             0
-#  define SSL_F_DANE_TLSA_ADD                              0
-#  define SSL_F_DERIVE_SECRET_KEY_AND_IV                   0
-#  define SSL_F_DO_DTLS1_WRITE                             0
-#  define SSL_F_DO_SSL3_WRITE                              0
-#  define SSL_F_DTLS1_BUFFER_RECORD                        0
-#  define SSL_F_DTLS1_CHECK_TIMEOUT_NUM                    0
-#  define SSL_F_DTLS1_HEARTBEAT                            0
-#  define SSL_F_DTLS1_HM_FRAGMENT_NEW                      0
-#  define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  0
-#  define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS             0
-#  define SSL_F_DTLS1_PROCESS_RECORD                       0
-#  define SSL_F_DTLS1_READ_BYTES                           0
-#  define SSL_F_DTLS1_READ_FAILED                          0
-#  define SSL_F_DTLS1_RETRANSMIT_MESSAGE                   0
-#  define SSL_F_DTLS1_WRITE_APP_DATA_BYTES                 0
-#  define SSL_F_DTLS1_WRITE_BYTES                          0
-#  define SSL_F_DTLSV1_LISTEN                              0
-#  define SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC          0
-#  define SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST        0
-#  define SSL_F_DTLS_GET_REASSEMBLED_MESSAGE               0
-#  define SSL_F_DTLS_PROCESS_HELLO_VERIFY                  0
-#  define SSL_F_DTLS_RECORD_LAYER_NEW                      0
-#  define SSL_F_DTLS_WAIT_FOR_DRY                          0
-#  define SSL_F_EARLY_DATA_COUNT_OK                        0
-#  define SSL_F_FINAL_EARLY_DATA                           0
-#  define SSL_F_FINAL_EC_PT_FORMATS                        0
-#  define SSL_F_FINAL_EMS                                  0
-#  define SSL_F_FINAL_KEY_SHARE                            0
-#  define SSL_F_FINAL_MAXFRAGMENTLEN                       0
-#  define SSL_F_FINAL_RENEGOTIATE                          0
-#  define SSL_F_FINAL_SERVER_NAME                          0
-#  define SSL_F_FINAL_SIG_ALGS                             0
-#  define SSL_F_GET_CERT_VERIFY_TBS_DATA                   0
-#  define SSL_F_NSS_KEYLOG_INT                             0
-#  define SSL_F_OPENSSL_INIT_SSL                           0
-#  define SSL_F_OSSL_STATEM_CLIENT13_READ_TRANSITION       0
-#  define SSL_F_OSSL_STATEM_CLIENT13_WRITE_TRANSITION      0
-#  define SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE       0
-#  define SSL_F_OSSL_STATEM_CLIENT_POST_PROCESS_MESSAGE    0
-#  define SSL_F_OSSL_STATEM_CLIENT_PROCESS_MESSAGE         0
-#  define SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION         0
-#  define SSL_F_OSSL_STATEM_CLIENT_WRITE_TRANSITION        0
-#  define SSL_F_OSSL_STATEM_SERVER13_READ_TRANSITION       0
-#  define SSL_F_OSSL_STATEM_SERVER13_WRITE_TRANSITION      0
-#  define SSL_F_OSSL_STATEM_SERVER_CONSTRUCT_MESSAGE       0
-#  define SSL_F_OSSL_STATEM_SERVER_POST_PROCESS_MESSAGE    0
-#  define SSL_F_OSSL_STATEM_SERVER_POST_WORK               0
-#  define SSL_F_OSSL_STATEM_SERVER_PRE_WORK                0
-#  define SSL_F_OSSL_STATEM_SERVER_PROCESS_MESSAGE         0
-#  define SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION         0
-#  define SSL_F_OSSL_STATEM_SERVER_WRITE_TRANSITION        0
-#  define SSL_F_PARSE_CA_NAMES                             0
-#  define SSL_F_PITEM_NEW                                  0
-#  define SSL_F_PQUEUE_NEW                                 0
-#  define SSL_F_PROCESS_KEY_SHARE_EXT                      0
-#  define SSL_F_READ_STATE_MACHINE                         0
-#  define SSL_F_SET_CLIENT_CIPHERSUITE                     0
-#  define SSL_F_SRP_GENERATE_CLIENT_MASTER_SECRET          0
-#  define SSL_F_SRP_GENERATE_SERVER_MASTER_SECRET          0
-#  define SSL_F_SRP_VERIFY_SERVER_PARAM                    0
-#  define SSL_F_SSL3_CHANGE_CIPHER_STATE                   0
-#  define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              0
-#  define SSL_F_SSL3_CTRL                                  0
-#  define SSL_F_SSL3_CTX_CTRL                              0
-#  define SSL_F_SSL3_DIGEST_CACHED_RECORDS                 0
-#  define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 0
-#  define SSL_F_SSL3_ENC                                   0
-#  define SSL_F_SSL3_FINAL_FINISH_MAC                      0
-#  define SSL_F_SSL3_FINISH_MAC                            0
-#  define SSL_F_SSL3_GENERATE_KEY_BLOCK                    0
-#  define SSL_F_SSL3_GENERATE_MASTER_SECRET                0
-#  define SSL_F_SSL3_GET_RECORD                            0
-#  define SSL_F_SSL3_INIT_FINISHED_MAC                     0
-#  define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     0
-#  define SSL_F_SSL3_READ_BYTES                            0
-#  define SSL_F_SSL3_READ_N                                0
-#  define SSL_F_SSL3_SETUP_KEY_BLOCK                       0
-#  define SSL_F_SSL3_SETUP_READ_BUFFER                     0
-#  define SSL_F_SSL3_SETUP_WRITE_BUFFER                    0
-#  define SSL_F_SSL3_WRITE_BYTES                           0
-#  define SSL_F_SSL3_WRITE_PENDING                         0
-#  define SSL_F_SSL_ADD_CERT_CHAIN                         0
-#  define SSL_F_SSL_ADD_CERT_TO_BUF                        0
-#  define SSL_F_SSL_ADD_CERT_TO_WPACKET                    0
-#  define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT        0
-#  define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT                 0
-#  define SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT           0
-#  define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK         0
-#  define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK        0
-#  define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT        0
-#  define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT                 0
-#  define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT           0
-#  define SSL_F_SSL_BUILD_CERT_CHAIN                       0
-#  define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   0
-#  define SSL_F_SSL_CACHE_CIPHERLIST                       0
-#  define SSL_F_SSL_CERT_ADD0_CHAIN_CERT                   0
-#  define SSL_F_SSL_CERT_DUP                               0
-#  define SSL_F_SSL_CERT_NEW                               0
-#  define SSL_F_SSL_CERT_SET0_CHAIN                        0
-#  define SSL_F_SSL_CHECK_PRIVATE_KEY                      0
-#  define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT               0
-#  define SSL_F_SSL_CHECK_SRP_EXT_CLIENTHELLO              0
-#  define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG            0
-#  define SSL_F_SSL_CHOOSE_CLIENT_VERSION                  0
-#  define SSL_F_SSL_CIPHER_DESCRIPTION                     0
-#  define SSL_F_SSL_CIPHER_LIST_TO_BYTES                   0
-#  define SSL_F_SSL_CIPHER_PROCESS_RULESTR                 0
-#  define SSL_F_SSL_CIPHER_STRENGTH_SORT                   0
-#  define SSL_F_SSL_CLEAR                                  0
-#  define SSL_F_SSL_CLIENT_HELLO_GET1_EXTENSIONS_PRESENT   0
-#  define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD            0
-#  define SSL_F_SSL_CONF_CMD                               0
-#  define SSL_F_SSL_CREATE_CIPHER_LIST                     0
-#  define SSL_F_SSL_CTRL                                   0
-#  define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  0
-#  define SSL_F_SSL_CTX_ENABLE_CT                          0
-#  define SSL_F_SSL_CTX_MAKE_PROFILES                      0
-#  define SSL_F_SSL_CTX_NEW                                0
-#  define SSL_F_SSL_CTX_SET_ALPN_PROTOS                    0
-#  define SSL_F_SSL_CTX_SET_CIPHER_LIST                    0
-#  define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             0
-#  define SSL_F_SSL_CTX_SET_CT_VALIDATION_CALLBACK         0
-#  define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT             0
-#  define SSL_F_SSL_CTX_SET_SSL_VERSION                    0
-#  define SSL_F_SSL_CTX_SET_TLSEXT_MAX_FRAGMENT_LENGTH     0
-#  define SSL_F_SSL_CTX_USE_CERTIFICATE                    0
-#  define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               0
-#  define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               0
-#  define SSL_F_SSL_CTX_USE_PRIVATEKEY                     0
-#  define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                0
-#  define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE                0
-#  define SSL_F_SSL_CTX_USE_PSK_IDENTITY_HINT              0
-#  define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY                  0
-#  define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1             0
-#  define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             0
-#  define SSL_F_SSL_CTX_USE_SERVERINFO                     0
-#  define SSL_F_SSL_CTX_USE_SERVERINFO_EX                  0
-#  define SSL_F_SSL_CTX_USE_SERVERINFO_FILE                0
-#  define SSL_F_SSL_DANE_DUP                               0
-#  define SSL_F_SSL_DANE_ENABLE                            0
-#  define SSL_F_SSL_DERIVE                                 0
-#  define SSL_F_SSL_DO_CONFIG                              0
-#  define SSL_F_SSL_DO_HANDSHAKE                           0
-#  define SSL_F_SSL_DUP_CA_LIST                            0
-#  define SSL_F_SSL_ENABLE_CT                              0
-#  define SSL_F_SSL_GENERATE_PKEY_GROUP                    0
-#  define SSL_F_SSL_GENERATE_SESSION_ID                    0
-#  define SSL_F_SSL_GET_NEW_SESSION                        0
-#  define SSL_F_SSL_GET_PREV_SESSION                       0
-#  define SSL_F_SSL_GET_SERVER_CERT_INDEX                  0
-#  define SSL_F_SSL_GET_SIGN_PKEY                          0
-#  define SSL_F_SSL_HANDSHAKE_HASH                         0
-#  define SSL_F_SSL_INIT_WBIO_BUFFER                       0
-#  define SSL_F_SSL_KEY_UPDATE                             0
-#  define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    0
-#  define SSL_F_SSL_LOG_MASTER_SECRET                      0
-#  define SSL_F_SSL_LOG_RSA_CLIENT_KEY_EXCHANGE            0
-#  define SSL_F_SSL_MODULE_INIT                            0
-#  define SSL_F_SSL_NEW                                    0
-#  define SSL_F_SSL_NEXT_PROTO_VALIDATE                    0
-#  define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT      0
-#  define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT               0
-#  define SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT         0
-#  define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT      0
-#  define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT               0
-#  define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         0
-#  define SSL_F_SSL_PEEK                                   0
-#  define SSL_F_SSL_PEEK_EX                                0
-#  define SSL_F_SSL_PEEK_INTERNAL                          0
-#  define SSL_F_SSL_READ                                   0
-#  define SSL_F_SSL_READ_EARLY_DATA                        0
-#  define SSL_F_SSL_READ_EX                                0
-#  define SSL_F_SSL_READ_INTERNAL                          0
-#  define SSL_F_SSL_RENEGOTIATE                            0
-#  define SSL_F_SSL_RENEGOTIATE_ABBREVIATED                0
-#  define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT                0
-#  define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT                0
-#  define SSL_F_SSL_SESSION_DUP                            0
-#  define SSL_F_SSL_SESSION_NEW                            0
-#  define SSL_F_SSL_SESSION_PRINT_FP                       0
-#  define SSL_F_SSL_SESSION_SET1_ID                        0
-#  define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                0
-#  define SSL_F_SSL_SET_ALPN_PROTOS                        0
-#  define SSL_F_SSL_SET_CERT                               0
-#  define SSL_F_SSL_SET_CERT_AND_KEY                       0
-#  define SSL_F_SSL_SET_CIPHER_LIST                        0
-#  define SSL_F_SSL_SET_CT_VALIDATION_CALLBACK             0
-#  define SSL_F_SSL_SET_FD                                 0
-#  define SSL_F_SSL_SET_PKEY                               0
-#  define SSL_F_SSL_SET_RFD                                0
-#  define SSL_F_SSL_SET_SESSION                            0
-#  define SSL_F_SSL_SET_SESSION_ID_CONTEXT                 0
-#  define SSL_F_SSL_SET_SESSION_TICKET_EXT                 0
-#  define SSL_F_SSL_SET_TLSEXT_MAX_FRAGMENT_LENGTH         0
-#  define SSL_F_SSL_SET_WFD                                0
-#  define SSL_F_SSL_SHUTDOWN                               0
-#  define SSL_F_SSL_SRP_CTX_INIT                           0
-#  define SSL_F_SSL_START_ASYNC_JOB                        0
-#  define SSL_F_SSL_UNDEFINED_FUNCTION                     0
-#  define SSL_F_SSL_UNDEFINED_VOID_FUNCTION                0
-#  define SSL_F_SSL_USE_CERTIFICATE                        0
-#  define SSL_F_SSL_USE_CERTIFICATE_ASN1                   0
-#  define SSL_F_SSL_USE_CERTIFICATE_FILE                   0
-#  define SSL_F_SSL_USE_PRIVATEKEY                         0
-#  define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    0
-#  define SSL_F_SSL_USE_PRIVATEKEY_FILE                    0
-#  define SSL_F_SSL_USE_PSK_IDENTITY_HINT                  0
-#  define SSL_F_SSL_USE_RSAPRIVATEKEY                      0
-#  define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 0
-#  define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 0
-#  define SSL_F_SSL_VALIDATE_CT                            0
-#  define SSL_F_SSL_VERIFY_CERT_CHAIN                      0
-#  define SSL_F_SSL_VERIFY_CLIENT_POST_HANDSHAKE           0
-#  define SSL_F_SSL_WRITE                                  0
-#  define SSL_F_SSL_WRITE_EARLY_DATA                       0
-#  define SSL_F_SSL_WRITE_EARLY_FINISH                     0
-#  define SSL_F_SSL_WRITE_EX                               0
-#  define SSL_F_SSL_WRITE_INTERNAL                         0
-#  define SSL_F_STATE_MACHINE                              0
-#  define SSL_F_TLS12_CHECK_PEER_SIGALG                    0
-#  define SSL_F_TLS12_COPY_SIGALGS                         0
-#  define SSL_F_TLS13_CHANGE_CIPHER_STATE                  0
-#  define SSL_F_TLS13_ENC                                  0
-#  define SSL_F_TLS13_FINAL_FINISH_MAC                     0
-#  define SSL_F_TLS13_GENERATE_SECRET                      0
-#  define SSL_F_TLS13_HKDF_EXPAND                          0
-#  define SSL_F_TLS13_RESTORE_HANDSHAKE_DIGEST_FOR_PHA     0
-#  define SSL_F_TLS13_SAVE_HANDSHAKE_DIGEST_FOR_PHA        0
-#  define SSL_F_TLS13_SETUP_KEY_BLOCK                      0
-#  define SSL_F_TLS1_CHANGE_CIPHER_STATE                   0
-#  define SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS            0
-#  define SSL_F_TLS1_ENC                                   0
-#  define SSL_F_TLS1_EXPORT_KEYING_MATERIAL                0
-#  define SSL_F_TLS1_GET_CURVELIST                         0
-#  define SSL_F_TLS1_PRF                                   0
-#  define SSL_F_TLS1_SAVE_U16                              0
-#  define SSL_F_TLS1_SETUP_KEY_BLOCK                       0
-#  define SSL_F_TLS1_SET_GROUPS                            0
-#  define SSL_F_TLS1_SET_RAW_SIGALGS                       0
-#  define SSL_F_TLS1_SET_SERVER_SIGALGS                    0
-#  define SSL_F_TLS1_SET_SHARED_SIGALGS                    0
-#  define SSL_F_TLS1_SET_SIGALGS                           0
-#  define SSL_F_TLS_CHOOSE_SIGALG                          0
-#  define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK          0
-#  define SSL_F_TLS_COLLECT_EXTENSIONS                     0
-#  define SSL_F_TLS_CONSTRUCT_CERTIFICATE_AUTHORITIES      0
-#  define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST          0
-#  define SSL_F_TLS_CONSTRUCT_CERT_STATUS                  0
-#  define SSL_F_TLS_CONSTRUCT_CERT_STATUS_BODY             0
-#  define SSL_F_TLS_CONSTRUCT_CERT_VERIFY                  0
-#  define SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC           0
-#  define SSL_F_TLS_CONSTRUCT_CKE_DHE                      0
-#  define SSL_F_TLS_CONSTRUCT_CKE_ECDHE                    0
-#  define SSL_F_TLS_CONSTRUCT_CKE_GOST                     0
-#  define SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE             0
-#  define SSL_F_TLS_CONSTRUCT_CKE_RSA                      0
-#  define SSL_F_TLS_CONSTRUCT_CKE_SRP                      0
-#  define SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE           0
-#  define SSL_F_TLS_CONSTRUCT_CLIENT_HELLO                 0
-#  define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE          0
-#  define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY                0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_ALPN                    0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_CERTIFICATE             0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_COOKIE                  0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_EARLY_DATA              0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_EC_PT_FORMATS           0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_EMS                     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_ETM                     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_HELLO                   0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_KEY_EXCHANGE            0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE               0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_MAXFRAGMENTLEN          0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_NPN                     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_PADDING                 0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_POST_HANDSHAKE_AUTH     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_PSK                     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_PSK_KEX_MODES           0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_RENEGOTIATE             0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SCT                     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SERVER_NAME             0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SESSION_TICKET          0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SIG_ALGS                0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SRP                     0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_STATUS_REQUEST          0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_GROUPS        0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_VERSIONS      0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_USE_SRTP                0
-#  define SSL_F_TLS_CONSTRUCT_CTOS_VERIFY                  0
-#  define SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS         0
-#  define SSL_F_TLS_CONSTRUCT_END_OF_EARLY_DATA            0
-#  define SSL_F_TLS_CONSTRUCT_EXTENSIONS                   0
-#  define SSL_F_TLS_CONSTRUCT_FINISHED                     0
-#  define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST                0
-#  define SSL_F_TLS_CONSTRUCT_HELLO_RETRY_REQUEST          0
-#  define SSL_F_TLS_CONSTRUCT_KEY_UPDATE                   0
-#  define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET           0
-#  define SSL_F_TLS_CONSTRUCT_NEXT_PROTO                   0
-#  define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE           0
-#  define SSL_F_TLS_CONSTRUCT_SERVER_HELLO                 0
-#  define SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE          0
-#  define SSL_F_TLS_CONSTRUCT_STOC_ALPN                    0
-#  define SSL_F_TLS_CONSTRUCT_STOC_CERTIFICATE             0
-#  define SSL_F_TLS_CONSTRUCT_STOC_COOKIE                  0
-#  define SSL_F_TLS_CONSTRUCT_STOC_CRYPTOPRO_BUG           0
-#  define SSL_F_TLS_CONSTRUCT_STOC_DONE                    0
-#  define SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA              0
-#  define SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA_INFO         0
-#  define SSL_F_TLS_CONSTRUCT_STOC_EC_PT_FORMATS           0
-#  define SSL_F_TLS_CONSTRUCT_STOC_EMS                     0
-#  define SSL_F_TLS_CONSTRUCT_STOC_ETM                     0
-#  define SSL_F_TLS_CONSTRUCT_STOC_HELLO                   0
-#  define SSL_F_TLS_CONSTRUCT_STOC_KEY_EXCHANGE            0
-#  define SSL_F_TLS_CONSTRUCT_STOC_KEY_SHARE               0
-#  define SSL_F_TLS_CONSTRUCT_STOC_MAXFRAGMENTLEN          0
-#  define SSL_F_TLS_CONSTRUCT_STOC_NEXT_PROTO_NEG          0
-#  define SSL_F_TLS_CONSTRUCT_STOC_PSK                     0
-#  define SSL_F_TLS_CONSTRUCT_STOC_RENEGOTIATE             0
-#  define SSL_F_TLS_CONSTRUCT_STOC_SERVER_NAME             0
-#  define SSL_F_TLS_CONSTRUCT_STOC_SESSION_TICKET          0
-#  define SSL_F_TLS_CONSTRUCT_STOC_STATUS_REQUEST          0
-#  define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_GROUPS        0
-#  define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_VERSIONS      0
-#  define SSL_F_TLS_CONSTRUCT_STOC_USE_SRTP                0
-#  define SSL_F_TLS_EARLY_POST_PROCESS_CLIENT_HELLO        0
-#  define SSL_F_TLS_FINISH_HANDSHAKE                       0
-#  define SSL_F_TLS_GET_MESSAGE_BODY                       0
-#  define SSL_F_TLS_GET_MESSAGE_HEADER                     0
-#  define SSL_F_TLS_HANDLE_ALPN                            0
-#  define SSL_F_TLS_HANDLE_STATUS_REQUEST                  0
-#  define SSL_F_TLS_PARSE_CERTIFICATE_AUTHORITIES          0
-#  define SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT               0
-#  define SSL_F_TLS_PARSE_CTOS_ALPN                        0
-#  define SSL_F_TLS_PARSE_CTOS_COOKIE                      0
-#  define SSL_F_TLS_PARSE_CTOS_EARLY_DATA                  0
-#  define SSL_F_TLS_PARSE_CTOS_EC_PT_FORMATS               0
-#  define SSL_F_TLS_PARSE_CTOS_EMS                         0
-#  define SSL_F_TLS_PARSE_CTOS_KEY_SHARE                   0
-#  define SSL_F_TLS_PARSE_CTOS_MAXFRAGMENTLEN              0
-#  define SSL_F_TLS_PARSE_CTOS_POST_HANDSHAKE_AUTH         0
-#  define SSL_F_TLS_PARSE_CTOS_PSK                         0
-#  define SSL_F_TLS_PARSE_CTOS_PSK_KEX_MODES               0
-#  define SSL_F_TLS_PARSE_CTOS_RENEGOTIATE                 0
-#  define SSL_F_TLS_PARSE_CTOS_SERVER_NAME                 0
-#  define SSL_F_TLS_PARSE_CTOS_SESSION_TICKET              0
-#  define SSL_F_TLS_PARSE_CTOS_SIG_ALGS                    0
-#  define SSL_F_TLS_PARSE_CTOS_SIG_ALGS_CERT               0
-#  define SSL_F_TLS_PARSE_CTOS_SRP                         0
-#  define SSL_F_TLS_PARSE_CTOS_STATUS_REQUEST              0
-#  define SSL_F_TLS_PARSE_CTOS_SUPPORTED_GROUPS            0
-#  define SSL_F_TLS_PARSE_CTOS_USE_SRTP                    0
-#  define SSL_F_TLS_PARSE_STOC_ALPN                        0
-#  define SSL_F_TLS_PARSE_STOC_COOKIE                      0
-#  define SSL_F_TLS_PARSE_STOC_EARLY_DATA                  0
-#  define SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO             0
-#  define SSL_F_TLS_PARSE_STOC_EC_PT_FORMATS               0
-#  define SSL_F_TLS_PARSE_STOC_KEY_SHARE                   0
-#  define SSL_F_TLS_PARSE_STOC_MAXFRAGMENTLEN              0
-#  define SSL_F_TLS_PARSE_STOC_NPN                         0
-#  define SSL_F_TLS_PARSE_STOC_PSK                         0
-#  define SSL_F_TLS_PARSE_STOC_RENEGOTIATE                 0
-#  define SSL_F_TLS_PARSE_STOC_SCT                         0
-#  define SSL_F_TLS_PARSE_STOC_SERVER_NAME                 0
-#  define SSL_F_TLS_PARSE_STOC_SESSION_TICKET              0
-#  define SSL_F_TLS_PARSE_STOC_STATUS_REQUEST              0
-#  define SSL_F_TLS_PARSE_STOC_SUPPORTED_VERSIONS          0
-#  define SSL_F_TLS_PARSE_STOC_USE_SRTP                    0
-#  define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO              0
-#  define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE       0
-#  define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE             0
-#  define SSL_F_TLS_PROCESS_AS_HELLO_RETRY_REQUEST         0
-#  define SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST            0
-#  define SSL_F_TLS_PROCESS_CERT_STATUS                    0
-#  define SSL_F_TLS_PROCESS_CERT_STATUS_BODY               0
-#  define SSL_F_TLS_PROCESS_CERT_VERIFY                    0
-#  define SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC             0
-#  define SSL_F_TLS_PROCESS_CKE_DHE                        0
-#  define SSL_F_TLS_PROCESS_CKE_ECDHE                      0
-#  define SSL_F_TLS_PROCESS_CKE_GOST                       0
-#  define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE               0
-#  define SSL_F_TLS_PROCESS_CKE_RSA                        0
-#  define SSL_F_TLS_PROCESS_CKE_SRP                        0
-#  define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE             0
-#  define SSL_F_TLS_PROCESS_CLIENT_HELLO                   0
-#  define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE            0
-#  define SSL_F_TLS_PROCESS_ENCRYPTED_EXTENSIONS           0
-#  define SSL_F_TLS_PROCESS_END_OF_EARLY_DATA              0
-#  define SSL_F_TLS_PROCESS_FINISHED                       0
-#  define SSL_F_TLS_PROCESS_HELLO_REQ                      0
-#  define SSL_F_TLS_PROCESS_HELLO_RETRY_REQUEST            0
-#  define SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT          0
-#  define SSL_F_TLS_PROCESS_KEY_EXCHANGE                   0
-#  define SSL_F_TLS_PROCESS_KEY_UPDATE                     0
-#  define SSL_F_TLS_PROCESS_NEW_SESSION_TICKET             0
-#  define SSL_F_TLS_PROCESS_NEXT_PROTO                     0
-#  define SSL_F_TLS_PROCESS_SERVER_CERTIFICATE             0
-#  define SSL_F_TLS_PROCESS_SERVER_DONE                    0
-#  define SSL_F_TLS_PROCESS_SERVER_HELLO                   0
-#  define SSL_F_TLS_PROCESS_SKE_DHE                        0
-#  define SSL_F_TLS_PROCESS_SKE_ECDHE                      0
-#  define SSL_F_TLS_PROCESS_SKE_PSK_PREAMBLE               0
-#  define SSL_F_TLS_PROCESS_SKE_SRP                        0
-#  define SSL_F_TLS_PSK_DO_BINDER                          0
-#  define SSL_F_TLS_SCAN_CLIENTHELLO_TLSEXT                0
-#  define SSL_F_TLS_SETUP_HANDSHAKE                        0
-#  define SSL_F_USE_CERTIFICATE_CHAIN_FILE                 0
-#  define SSL_F_WPACKET_INTERN_INIT_LEN                    0
-#  define SSL_F_WPACKET_START_SUB_PACKET_LEN__             0
-#  define SSL_F_WRITE_STATE_MACHINE                        0
-# endif
+#define SSL_F_ADD_CLIENT_KEY_SHARE_EXT 0
+#define SSL_F_ADD_KEY_SHARE 0
+#define SSL_F_BYTES_TO_CIPHER_LIST 0
+#define SSL_F_CHECK_SUITEB_CIPHER_LIST 0
+#define SSL_F_CIPHERSUITE_CB 0
+#define SSL_F_CONSTRUCT_CA_NAMES 0
+#define SSL_F_CONSTRUCT_KEY_EXCHANGE_TBS 0
+#define SSL_F_CONSTRUCT_STATEFUL_TICKET 0
+#define SSL_F_CONSTRUCT_STATELESS_TICKET 0
+#define SSL_F_CREATE_SYNTHETIC_MESSAGE_HASH 0
+#define SSL_F_CREATE_TICKET_PREQUEL 0
+#define SSL_F_CT_MOVE_SCTS 0
+#define SSL_F_CT_STRICT 0
+#define SSL_F_CUSTOM_EXT_ADD 0
+#define SSL_F_CUSTOM_EXT_PARSE 0
+#define SSL_F_D2I_SSL_SESSION 0
+#define SSL_F_DANE_CTX_ENABLE 0
+#define SSL_F_DANE_MTYPE_SET 0
+#define SSL_F_DANE_TLSA_ADD 0
+#define SSL_F_DERIVE_SECRET_KEY_AND_IV 0
+#define SSL_F_DO_DTLS1_WRITE 0
+#define SSL_F_DO_SSL3_WRITE 0
+#define SSL_F_DTLS1_BUFFER_RECORD 0
+#define SSL_F_DTLS1_CHECK_TIMEOUT_NUM 0
+#define SSL_F_DTLS1_HEARTBEAT 0
+#define SSL_F_DTLS1_HM_FRAGMENT_NEW 0
+#define SSL_F_DTLS1_PREPROCESS_FRAGMENT 0
+#define SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS 0
+#define SSL_F_DTLS1_PROCESS_RECORD 0
+#define SSL_F_DTLS1_READ_BYTES 0
+#define SSL_F_DTLS1_READ_FAILED 0
+#define SSL_F_DTLS1_RETRANSMIT_MESSAGE 0
+#define SSL_F_DTLS1_WRITE_APP_DATA_BYTES 0
+#define SSL_F_DTLS1_WRITE_BYTES 0
+#define SSL_F_DTLSV1_LISTEN 0
+#define SSL_F_DTLS_CONSTRUCT_CHANGE_CIPHER_SPEC 0
+#define SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST 0
+#define SSL_F_DTLS_GET_REASSEMBLED_MESSAGE 0
+#define SSL_F_DTLS_PROCESS_HELLO_VERIFY 0
+#define SSL_F_DTLS_RECORD_LAYER_NEW 0
+#define SSL_F_DTLS_WAIT_FOR_DRY 0
+#define SSL_F_EARLY_DATA_COUNT_OK 0
+#define SSL_F_FINAL_EARLY_DATA 0
+#define SSL_F_FINAL_EC_PT_FORMATS 0
+#define SSL_F_FINAL_EMS 0
+#define SSL_F_FINAL_KEY_SHARE 0
+#define SSL_F_FINAL_MAXFRAGMENTLEN 0
+#define SSL_F_FINAL_RENEGOTIATE 0
+#define SSL_F_FINAL_SERVER_NAME 0
+#define SSL_F_FINAL_SIG_ALGS 0
+#define SSL_F_GET_CERT_VERIFY_TBS_DATA 0
+#define SSL_F_NSS_KEYLOG_INT 0
+#define SSL_F_OPENSSL_INIT_SSL 0
+#define SSL_F_OSSL_STATEM_CLIENT13_READ_TRANSITION 0
+#define SSL_F_OSSL_STATEM_CLIENT13_WRITE_TRANSITION 0
+#define SSL_F_OSSL_STATEM_CLIENT_CONSTRUCT_MESSAGE 0
+#define SSL_F_OSSL_STATEM_CLIENT_POST_PROCESS_MESSAGE 0
+#define SSL_F_OSSL_STATEM_CLIENT_PROCESS_MESSAGE 0
+#define SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION 0
+#define SSL_F_OSSL_STATEM_CLIENT_WRITE_TRANSITION 0
+#define SSL_F_OSSL_STATEM_SERVER13_READ_TRANSITION 0
+#define SSL_F_OSSL_STATEM_SERVER13_WRITE_TRANSITION 0
+#define SSL_F_OSSL_STATEM_SERVER_CONSTRUCT_MESSAGE 0
+#define SSL_F_OSSL_STATEM_SERVER_POST_PROCESS_MESSAGE 0
+#define SSL_F_OSSL_STATEM_SERVER_POST_WORK 0
+#define SSL_F_OSSL_STATEM_SERVER_PRE_WORK 0
+#define SSL_F_OSSL_STATEM_SERVER_PROCESS_MESSAGE 0
+#define SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION 0
+#define SSL_F_OSSL_STATEM_SERVER_WRITE_TRANSITION 0
+#define SSL_F_PARSE_CA_NAMES 0
+#define SSL_F_PITEM_NEW 0
+#define SSL_F_PQUEUE_NEW 0
+#define SSL_F_PROCESS_KEY_SHARE_EXT 0
+#define SSL_F_READ_STATE_MACHINE 0
+#define SSL_F_SET_CLIENT_CIPHERSUITE 0
+#define SSL_F_SRP_GENERATE_CLIENT_MASTER_SECRET 0
+#define SSL_F_SRP_GENERATE_SERVER_MASTER_SECRET 0
+#define SSL_F_SRP_VERIFY_SERVER_PARAM 0
+#define SSL_F_SSL3_CHANGE_CIPHER_STATE 0
+#define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 0
+#define SSL_F_SSL3_CTRL 0
+#define SSL_F_SSL3_CTX_CTRL 0
+#define SSL_F_SSL3_DIGEST_CACHED_RECORDS 0
+#define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC 0
+#define SSL_F_SSL3_ENC 0
+#define SSL_F_SSL3_FINAL_FINISH_MAC 0
+#define SSL_F_SSL3_FINISH_MAC 0
+#define SSL_F_SSL3_GENERATE_KEY_BLOCK 0
+#define SSL_F_SSL3_GENERATE_MASTER_SECRET 0
+#define SSL_F_SSL3_GET_RECORD 0
+#define SSL_F_SSL3_INIT_FINISHED_MAC 0
+#define SSL_F_SSL3_OUTPUT_CERT_CHAIN 0
+#define SSL_F_SSL3_READ_BYTES 0
+#define SSL_F_SSL3_READ_N 0
+#define SSL_F_SSL3_SETUP_KEY_BLOCK 0
+#define SSL_F_SSL3_SETUP_READ_BUFFER 0
+#define SSL_F_SSL3_SETUP_WRITE_BUFFER 0
+#define SSL_F_SSL3_WRITE_BYTES 0
+#define SSL_F_SSL3_WRITE_PENDING 0
+#define SSL_F_SSL_ADD_CERT_CHAIN 0
+#define SSL_F_SSL_ADD_CERT_TO_BUF 0
+#define SSL_F_SSL_ADD_CERT_TO_WPACKET 0
+#define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT 0
+#define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT 0
+#define SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT 0
+#define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK 0
+#define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK 0
+#define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT 0
+#define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT 0
+#define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT 0
+#define SSL_F_SSL_BUILD_CERT_CHAIN 0
+#define SSL_F_SSL_BYTES_TO_CIPHER_LIST 0
+#define SSL_F_SSL_CACHE_CIPHERLIST 0
+#define SSL_F_SSL_CERT_ADD0_CHAIN_CERT 0
+#define SSL_F_SSL_CERT_DUP 0
+#define SSL_F_SSL_CERT_NEW 0
+#define SSL_F_SSL_CERT_SET0_CHAIN 0
+#define SSL_F_SSL_CHECK_PRIVATE_KEY 0
+#define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT 0
+#define SSL_F_SSL_CHECK_SRP_EXT_CLIENTHELLO 0
+#define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG 0
+#define SSL_F_SSL_CHOOSE_CLIENT_VERSION 0
+#define SSL_F_SSL_CIPHER_DESCRIPTION 0
+#define SSL_F_SSL_CIPHER_LIST_TO_BYTES 0
+#define SSL_F_SSL_CIPHER_PROCESS_RULESTR 0
+#define SSL_F_SSL_CIPHER_STRENGTH_SORT 0
+#define SSL_F_SSL_CLEAR 0
+#define SSL_F_SSL_CLIENT_HELLO_GET1_EXTENSIONS_PRESENT 0
+#define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD 0
+#define SSL_F_SSL_CONF_CMD 0
+#define SSL_F_SSL_CREATE_CIPHER_LIST 0
+#define SSL_F_SSL_CTRL 0
+#define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY 0
+#define SSL_F_SSL_CTX_ENABLE_CT 0
+#define SSL_F_SSL_CTX_MAKE_PROFILES 0
+#define SSL_F_SSL_CTX_NEW 0
+#define SSL_F_SSL_CTX_SET_ALPN_PROTOS 0
+#define SSL_F_SSL_CTX_SET_CIPHER_LIST 0
+#define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE 0
+#define SSL_F_SSL_CTX_SET_CT_VALIDATION_CALLBACK 0
+#define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT 0
+#define SSL_F_SSL_CTX_SET_SSL_VERSION 0
+#define SSL_F_SSL_CTX_SET_TLSEXT_MAX_FRAGMENT_LENGTH 0
+#define SSL_F_SSL_CTX_USE_CERTIFICATE 0
+#define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1 0
+#define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE 0
+#define SSL_F_SSL_CTX_USE_PRIVATEKEY 0
+#define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1 0
+#define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE 0
+#define SSL_F_SSL_CTX_USE_PSK_IDENTITY_HINT 0
+#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY 0
+#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1 0
+#define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE 0
+#define SSL_F_SSL_CTX_USE_SERVERINFO 0
+#define SSL_F_SSL_CTX_USE_SERVERINFO_EX 0
+#define SSL_F_SSL_CTX_USE_SERVERINFO_FILE 0
+#define SSL_F_SSL_DANE_DUP 0
+#define SSL_F_SSL_DANE_ENABLE 0
+#define SSL_F_SSL_DERIVE 0
+#define SSL_F_SSL_DO_CONFIG 0
+#define SSL_F_SSL_DO_HANDSHAKE 0
+#define SSL_F_SSL_DUP_CA_LIST 0
+#define SSL_F_SSL_ENABLE_CT 0
+#define SSL_F_SSL_GENERATE_PKEY_GROUP 0
+#define SSL_F_SSL_GENERATE_SESSION_ID 0
+#define SSL_F_SSL_GET_NEW_SESSION 0
+#define SSL_F_SSL_GET_PREV_SESSION 0
+#define SSL_F_SSL_GET_SERVER_CERT_INDEX 0
+#define SSL_F_SSL_GET_SIGN_PKEY 0
+#define SSL_F_SSL_HANDSHAKE_HASH 0
+#define SSL_F_SSL_INIT_WBIO_BUFFER 0
+#define SSL_F_SSL_KEY_UPDATE 0
+#define SSL_F_SSL_LOAD_CLIENT_CA_FILE 0
+#define SSL_F_SSL_LOG_MASTER_SECRET 0
+#define SSL_F_SSL_LOG_RSA_CLIENT_KEY_EXCHANGE 0
+#define SSL_F_SSL_MODULE_INIT 0
+#define SSL_F_SSL_NEW 0
+#define SSL_F_SSL_NEXT_PROTO_VALIDATE 0
+#define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT 0
+#define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT 0
+#define SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT 0
+#define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT 0
+#define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT 0
+#define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT 0
+#define SSL_F_SSL_PEEK 0
+#define SSL_F_SSL_PEEK_EX 0
+#define SSL_F_SSL_PEEK_INTERNAL 0
+#define SSL_F_SSL_READ 0
+#define SSL_F_SSL_READ_EARLY_DATA 0
+#define SSL_F_SSL_READ_EX 0
+#define SSL_F_SSL_READ_INTERNAL 0
+#define SSL_F_SSL_RENEGOTIATE 0
+#define SSL_F_SSL_RENEGOTIATE_ABBREVIATED 0
+#define SSL_F_SSL_SCAN_CLIENTHELLO_TLSEXT 0
+#define SSL_F_SSL_SCAN_SERVERHELLO_TLSEXT 0
+#define SSL_F_SSL_SESSION_DUP 0
+#define SSL_F_SSL_SESSION_NEW 0
+#define SSL_F_SSL_SESSION_PRINT_FP 0
+#define SSL_F_SSL_SESSION_SET1_ID 0
+#define SSL_F_SSL_SESSION_SET1_ID_CONTEXT 0
+#define SSL_F_SSL_SET_ALPN_PROTOS 0
+#define SSL_F_SSL_SET_CERT 0
+#define SSL_F_SSL_SET_CERT_AND_KEY 0
+#define SSL_F_SSL_SET_CIPHER_LIST 0
+#define SSL_F_SSL_SET_CT_VALIDATION_CALLBACK 0
+#define SSL_F_SSL_SET_FD 0
+#define SSL_F_SSL_SET_PKEY 0
+#define SSL_F_SSL_SET_RFD 0
+#define SSL_F_SSL_SET_SESSION 0
+#define SSL_F_SSL_SET_SESSION_ID_CONTEXT 0
+#define SSL_F_SSL_SET_SESSION_TICKET_EXT 0
+#define SSL_F_SSL_SET_TLSEXT_MAX_FRAGMENT_LENGTH 0
+#define SSL_F_SSL_SET_WFD 0
+#define SSL_F_SSL_SHUTDOWN 0
+#define SSL_F_SSL_SRP_CTX_INIT 0
+#define SSL_F_SSL_START_ASYNC_JOB 0
+#define SSL_F_SSL_UNDEFINED_FUNCTION 0
+#define SSL_F_SSL_UNDEFINED_VOID_FUNCTION 0
+#define SSL_F_SSL_USE_CERTIFICATE 0
+#define SSL_F_SSL_USE_CERTIFICATE_ASN1 0
+#define SSL_F_SSL_USE_CERTIFICATE_FILE 0
+#define SSL_F_SSL_USE_PRIVATEKEY 0
+#define SSL_F_SSL_USE_PRIVATEKEY_ASN1 0
+#define SSL_F_SSL_USE_PRIVATEKEY_FILE 0
+#define SSL_F_SSL_USE_PSK_IDENTITY_HINT 0
+#define SSL_F_SSL_USE_RSAPRIVATEKEY 0
+#define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1 0
+#define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE 0
+#define SSL_F_SSL_VALIDATE_CT 0
+#define SSL_F_SSL_VERIFY_CERT_CHAIN 0
+#define SSL_F_SSL_VERIFY_CLIENT_POST_HANDSHAKE 0
+#define SSL_F_SSL_WRITE 0
+#define SSL_F_SSL_WRITE_EARLY_DATA 0
+#define SSL_F_SSL_WRITE_EARLY_FINISH 0
+#define SSL_F_SSL_WRITE_EX 0
+#define SSL_F_SSL_WRITE_INTERNAL 0
+#define SSL_F_STATE_MACHINE 0
+#define SSL_F_TLS12_CHECK_PEER_SIGALG 0
+#define SSL_F_TLS12_COPY_SIGALGS 0
+#define SSL_F_TLS13_CHANGE_CIPHER_STATE 0
+#define SSL_F_TLS13_ENC 0
+#define SSL_F_TLS13_FINAL_FINISH_MAC 0
+#define SSL_F_TLS13_GENERATE_SECRET 0
+#define SSL_F_TLS13_HKDF_EXPAND 0
+#define SSL_F_TLS13_RESTORE_HANDSHAKE_DIGEST_FOR_PHA 0
+#define SSL_F_TLS13_SAVE_HANDSHAKE_DIGEST_FOR_PHA 0
+#define SSL_F_TLS13_SETUP_KEY_BLOCK 0
+#define SSL_F_TLS1_CHANGE_CIPHER_STATE 0
+#define SSL_F_TLS1_CHECK_DUPLICATE_EXTENSIONS 0
+#define SSL_F_TLS1_ENC 0
+#define SSL_F_TLS1_EXPORT_KEYING_MATERIAL 0
+#define SSL_F_TLS1_GET_CURVELIST 0
+#define SSL_F_TLS1_PRF 0
+#define SSL_F_TLS1_SAVE_U16 0
+#define SSL_F_TLS1_SETUP_KEY_BLOCK 0
+#define SSL_F_TLS1_SET_GROUPS 0
+#define SSL_F_TLS1_SET_RAW_SIGALGS 0
+#define SSL_F_TLS1_SET_SERVER_SIGALGS 0
+#define SSL_F_TLS1_SET_SHARED_SIGALGS 0
+#define SSL_F_TLS1_SET_SIGALGS 0
+#define SSL_F_TLS_CHOOSE_SIGALG 0
+#define SSL_F_TLS_CLIENT_KEY_EXCHANGE_POST_WORK 0
+#define SSL_F_TLS_COLLECT_EXTENSIONS 0
+#define SSL_F_TLS_CONSTRUCT_CERTIFICATE_AUTHORITIES 0
+#define SSL_F_TLS_CONSTRUCT_CERTIFICATE_REQUEST 0
+#define SSL_F_TLS_CONSTRUCT_CERT_STATUS 0
+#define SSL_F_TLS_CONSTRUCT_CERT_STATUS_BODY 0
+#define SSL_F_TLS_CONSTRUCT_CERT_VERIFY 0
+#define SSL_F_TLS_CONSTRUCT_CHANGE_CIPHER_SPEC 0
+#define SSL_F_TLS_CONSTRUCT_CKE_DHE 0
+#define SSL_F_TLS_CONSTRUCT_CKE_ECDHE 0
+#define SSL_F_TLS_CONSTRUCT_CKE_GOST 0
+#define SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE 0
+#define SSL_F_TLS_CONSTRUCT_CKE_RSA 0
+#define SSL_F_TLS_CONSTRUCT_CKE_SRP 0
+#define SSL_F_TLS_CONSTRUCT_CLIENT_CERTIFICATE 0
+#define SSL_F_TLS_CONSTRUCT_CLIENT_HELLO 0
+#define SSL_F_TLS_CONSTRUCT_CLIENT_KEY_EXCHANGE 0
+#define SSL_F_TLS_CONSTRUCT_CLIENT_VERIFY 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_ALPN 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_CERTIFICATE 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_COOKIE 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_EARLY_DATA 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_EC_PT_FORMATS 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_EMS 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_ETM 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_HELLO 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_KEY_EXCHANGE 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_KEY_SHARE 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_MAXFRAGMENTLEN 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_NPN 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_PADDING 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_POST_HANDSHAKE_AUTH 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_PSK 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_PSK_KEX_MODES 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_RENEGOTIATE 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SCT 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SERVER_NAME 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SESSION_TICKET 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SIG_ALGS 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SRP 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_STATUS_REQUEST 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_GROUPS 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_SUPPORTED_VERSIONS 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_USE_SRTP 0
+#define SSL_F_TLS_CONSTRUCT_CTOS_VERIFY 0
+#define SSL_F_TLS_CONSTRUCT_ENCRYPTED_EXTENSIONS 0
+#define SSL_F_TLS_CONSTRUCT_END_OF_EARLY_DATA 0
+#define SSL_F_TLS_CONSTRUCT_EXTENSIONS 0
+#define SSL_F_TLS_CONSTRUCT_FINISHED 0
+#define SSL_F_TLS_CONSTRUCT_HELLO_REQUEST 0
+#define SSL_F_TLS_CONSTRUCT_HELLO_RETRY_REQUEST 0
+#define SSL_F_TLS_CONSTRUCT_KEY_UPDATE 0
+#define SSL_F_TLS_CONSTRUCT_NEW_SESSION_TICKET 0
+#define SSL_F_TLS_CONSTRUCT_NEXT_PROTO 0
+#define SSL_F_TLS_CONSTRUCT_SERVER_CERTIFICATE 0
+#define SSL_F_TLS_CONSTRUCT_SERVER_HELLO 0
+#define SSL_F_TLS_CONSTRUCT_SERVER_KEY_EXCHANGE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_ALPN 0
+#define SSL_F_TLS_CONSTRUCT_STOC_CERTIFICATE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_COOKIE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_CRYPTOPRO_BUG 0
+#define SSL_F_TLS_CONSTRUCT_STOC_DONE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA 0
+#define SSL_F_TLS_CONSTRUCT_STOC_EARLY_DATA_INFO 0
+#define SSL_F_TLS_CONSTRUCT_STOC_EC_PT_FORMATS 0
+#define SSL_F_TLS_CONSTRUCT_STOC_EMS 0
+#define SSL_F_TLS_CONSTRUCT_STOC_ETM 0
+#define SSL_F_TLS_CONSTRUCT_STOC_HELLO 0
+#define SSL_F_TLS_CONSTRUCT_STOC_KEY_EXCHANGE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_KEY_SHARE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_MAXFRAGMENTLEN 0
+#define SSL_F_TLS_CONSTRUCT_STOC_NEXT_PROTO_NEG 0
+#define SSL_F_TLS_CONSTRUCT_STOC_PSK 0
+#define SSL_F_TLS_CONSTRUCT_STOC_RENEGOTIATE 0
+#define SSL_F_TLS_CONSTRUCT_STOC_SERVER_NAME 0
+#define SSL_F_TLS_CONSTRUCT_STOC_SESSION_TICKET 0
+#define SSL_F_TLS_CONSTRUCT_STOC_STATUS_REQUEST 0
+#define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_GROUPS 0
+#define SSL_F_TLS_CONSTRUCT_STOC_SUPPORTED_VERSIONS 0
+#define SSL_F_TLS_CONSTRUCT_STOC_USE_SRTP 0
+#define SSL_F_TLS_EARLY_POST_PROCESS_CLIENT_HELLO 0
+#define SSL_F_TLS_FINISH_HANDSHAKE 0
+#define SSL_F_TLS_GET_MESSAGE_BODY 0
+#define SSL_F_TLS_GET_MESSAGE_HEADER 0
+#define SSL_F_TLS_HANDLE_ALPN 0
+#define SSL_F_TLS_HANDLE_STATUS_REQUEST 0
+#define SSL_F_TLS_PARSE_CERTIFICATE_AUTHORITIES 0
+#define SSL_F_TLS_PARSE_CLIENTHELLO_TLSEXT 0
+#define SSL_F_TLS_PARSE_CTOS_ALPN 0
+#define SSL_F_TLS_PARSE_CTOS_COOKIE 0
+#define SSL_F_TLS_PARSE_CTOS_EARLY_DATA 0
+#define SSL_F_TLS_PARSE_CTOS_EC_PT_FORMATS 0
+#define SSL_F_TLS_PARSE_CTOS_EMS 0
+#define SSL_F_TLS_PARSE_CTOS_KEY_SHARE 0
+#define SSL_F_TLS_PARSE_CTOS_MAXFRAGMENTLEN 0
+#define SSL_F_TLS_PARSE_CTOS_POST_HANDSHAKE_AUTH 0
+#define SSL_F_TLS_PARSE_CTOS_PSK 0
+#define SSL_F_TLS_PARSE_CTOS_PSK_KEX_MODES 0
+#define SSL_F_TLS_PARSE_CTOS_RENEGOTIATE 0
+#define SSL_F_TLS_PARSE_CTOS_SERVER_NAME 0
+#define SSL_F_TLS_PARSE_CTOS_SESSION_TICKET 0
+#define SSL_F_TLS_PARSE_CTOS_SIG_ALGS 0
+#define SSL_F_TLS_PARSE_CTOS_SIG_ALGS_CERT 0
+#define SSL_F_TLS_PARSE_CTOS_SRP 0
+#define SSL_F_TLS_PARSE_CTOS_STATUS_REQUEST 0
+#define SSL_F_TLS_PARSE_CTOS_SUPPORTED_GROUPS 0
+#define SSL_F_TLS_PARSE_CTOS_USE_SRTP 0
+#define SSL_F_TLS_PARSE_STOC_ALPN 0
+#define SSL_F_TLS_PARSE_STOC_COOKIE 0
+#define SSL_F_TLS_PARSE_STOC_EARLY_DATA 0
+#define SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO 0
+#define SSL_F_TLS_PARSE_STOC_EC_PT_FORMATS 0
+#define SSL_F_TLS_PARSE_STOC_KEY_SHARE 0
+#define SSL_F_TLS_PARSE_STOC_MAXFRAGMENTLEN 0
+#define SSL_F_TLS_PARSE_STOC_NPN 0
+#define SSL_F_TLS_PARSE_STOC_PSK 0
+#define SSL_F_TLS_PARSE_STOC_RENEGOTIATE 0
+#define SSL_F_TLS_PARSE_STOC_SCT 0
+#define SSL_F_TLS_PARSE_STOC_SERVER_NAME 0
+#define SSL_F_TLS_PARSE_STOC_SESSION_TICKET 0
+#define SSL_F_TLS_PARSE_STOC_STATUS_REQUEST 0
+#define SSL_F_TLS_PARSE_STOC_SUPPORTED_VERSIONS 0
+#define SSL_F_TLS_PARSE_STOC_USE_SRTP 0
+#define SSL_F_TLS_POST_PROCESS_CLIENT_HELLO 0
+#define SSL_F_TLS_POST_PROCESS_CLIENT_KEY_EXCHANGE 0
+#define SSL_F_TLS_PREPARE_CLIENT_CERTIFICATE 0
+#define SSL_F_TLS_PROCESS_AS_HELLO_RETRY_REQUEST 0
+#define SSL_F_TLS_PROCESS_CERTIFICATE_REQUEST 0
+#define SSL_F_TLS_PROCESS_CERT_STATUS 0
+#define SSL_F_TLS_PROCESS_CERT_STATUS_BODY 0
+#define SSL_F_TLS_PROCESS_CERT_VERIFY 0
+#define SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC 0
+#define SSL_F_TLS_PROCESS_CKE_DHE 0
+#define SSL_F_TLS_PROCESS_CKE_ECDHE 0
+#define SSL_F_TLS_PROCESS_CKE_GOST 0
+#define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE 0
+#define SSL_F_TLS_PROCESS_CKE_RSA 0
+#define SSL_F_TLS_PROCESS_CKE_SRP 0
+#define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE 0
+#define SSL_F_TLS_PROCESS_CLIENT_HELLO 0
+#define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE 0
+#define SSL_F_TLS_PROCESS_ENCRYPTED_EXTENSIONS 0
+#define SSL_F_TLS_PROCESS_END_OF_EARLY_DATA 0
+#define SSL_F_TLS_PROCESS_FINISHED 0
+#define SSL_F_TLS_PROCESS_HELLO_REQ 0
+#define SSL_F_TLS_PROCESS_HELLO_RETRY_REQUEST 0
+#define SSL_F_TLS_PROCESS_INITIAL_SERVER_FLIGHT 0
+#define SSL_F_TLS_PROCESS_KEY_EXCHANGE 0
+#define SSL_F_TLS_PROCESS_KEY_UPDATE 0
+#define SSL_F_TLS_PROCESS_NEW_SESSION_TICKET 0
+#define SSL_F_TLS_PROCESS_NEXT_PROTO 0
+#define SSL_F_TLS_PROCESS_SERVER_CERTIFICATE 0
+#define SSL_F_TLS_PROCESS_SERVER_DONE 0
+#define SSL_F_TLS_PROCESS_SERVER_HELLO 0
+#define SSL_F_TLS_PROCESS_SKE_DHE 0
+#define SSL_F_TLS_PROCESS_SKE_ECDHE 0
+#define SSL_F_TLS_PROCESS_SKE_PSK_PREAMBLE 0
+#define SSL_F_TLS_PROCESS_SKE_SRP 0
+#define SSL_F_TLS_PSK_DO_BINDER 0
+#define SSL_F_TLS_SCAN_CLIENTHELLO_TLSEXT 0
+#define SSL_F_TLS_SETUP_HANDSHAKE 0
+#define SSL_F_USE_CERTIFICATE_CHAIN_FILE 0
+#define SSL_F_WPACKET_INTERN_INIT_LEN 0
+#define SSL_F_WPACKET_START_SUB_PACKET_LEN__ 0
+#define SSL_F_WRITE_STATE_MACHINE 0
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/stack.h b/include/openssl/stack.h
index f0c5c54765af..82ef52ab72a7 100644
--- a/include/openssl/stack.h
+++ b/include/openssl/stack.h
@@ -8,15 +8,15 @@
  */
 
 #ifndef OPENSSL_STACK_H
-# define OPENSSL_STACK_H
-# pragma once
+#define OPENSSL_STACK_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_STACK_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_STACK_H
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -36,10 +36,10 @@ OPENSSL_STACK *OPENSSL_sk_new_null(void);
 OPENSSL_STACK *OPENSSL_sk_new_reserve(OPENSSL_sk_compfunc c, int n);
 int OPENSSL_sk_reserve(OPENSSL_STACK *st, int n);
 void OPENSSL_sk_free(OPENSSL_STACK *);
-void OPENSSL_sk_pop_free(OPENSSL_STACK *st, void (*func) (void *));
+void OPENSSL_sk_pop_free(OPENSSL_STACK *st, void (*func)(void *));
 OPENSSL_STACK *OPENSSL_sk_deep_copy(const OPENSSL_STACK *,
-                                    OPENSSL_sk_copyfunc c,
-                                    OPENSSL_sk_freefunc f);
+    OPENSSL_sk_copyfunc c,
+    OPENSSL_sk_freefunc f);
 int OPENSSL_sk_insert(OPENSSL_STACK *sk, const void *data, int where);
 void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc);
 void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p);
@@ -52,38 +52,38 @@ void *OPENSSL_sk_shift(OPENSSL_STACK *st);
 void *OPENSSL_sk_pop(OPENSSL_STACK *st);
 void OPENSSL_sk_zero(OPENSSL_STACK *st);
 OPENSSL_sk_compfunc OPENSSL_sk_set_cmp_func(OPENSSL_STACK *sk,
-                                            OPENSSL_sk_compfunc cmp);
+    OPENSSL_sk_compfunc cmp);
 OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *st);
 void OPENSSL_sk_sort(OPENSSL_STACK *st);
 int OPENSSL_sk_is_sorted(const OPENSSL_STACK *st);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define _STACK OPENSSL_STACK
-#  define sk_num OPENSSL_sk_num
-#  define sk_value OPENSSL_sk_value
-#  define sk_set OPENSSL_sk_set
-#  define sk_new OPENSSL_sk_new
-#  define sk_new_null OPENSSL_sk_new_null
-#  define sk_free OPENSSL_sk_free
-#  define sk_pop_free OPENSSL_sk_pop_free
-#  define sk_deep_copy OPENSSL_sk_deep_copy
-#  define sk_insert OPENSSL_sk_insert
-#  define sk_delete OPENSSL_sk_delete
-#  define sk_delete_ptr OPENSSL_sk_delete_ptr
-#  define sk_find OPENSSL_sk_find
-#  define sk_find_ex OPENSSL_sk_find_ex
-#  define sk_push OPENSSL_sk_push
-#  define sk_unshift OPENSSL_sk_unshift
-#  define sk_shift OPENSSL_sk_shift
-#  define sk_pop OPENSSL_sk_pop
-#  define sk_zero OPENSSL_sk_zero
-#  define sk_set_cmp_func OPENSSL_sk_set_cmp_func
-#  define sk_dup OPENSSL_sk_dup
-#  define sk_sort OPENSSL_sk_sort
-#  define sk_is_sorted OPENSSL_sk_is_sorted
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define _STACK OPENSSL_STACK
+#define sk_num OPENSSL_sk_num
+#define sk_value OPENSSL_sk_value
+#define sk_set OPENSSL_sk_set
+#define sk_new OPENSSL_sk_new
+#define sk_new_null OPENSSL_sk_new_null
+#define sk_free OPENSSL_sk_free
+#define sk_pop_free OPENSSL_sk_pop_free
+#define sk_deep_copy OPENSSL_sk_deep_copy
+#define sk_insert OPENSSL_sk_insert
+#define sk_delete OPENSSL_sk_delete
+#define sk_delete_ptr OPENSSL_sk_delete_ptr
+#define sk_find OPENSSL_sk_find
+#define sk_find_ex OPENSSL_sk_find_ex
+#define sk_push OPENSSL_sk_push
+#define sk_unshift OPENSSL_sk_unshift
+#define sk_shift OPENSSL_sk_shift
+#define sk_pop OPENSSL_sk_pop
+#define sk_zero OPENSSL_sk_zero
+#define sk_set_cmp_func OPENSSL_sk_set_cmp_func
+#define sk_dup OPENSSL_sk_dup
+#define sk_sort OPENSSL_sk_sort
+#define sk_is_sorted OPENSSL_sk_is_sorted
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/openssl/store.h b/include/openssl/store.h
index e6ea3cf87886..53c68516f8ee 100644
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -8,22 +8,22 @@
  */
 
 #ifndef OPENSSL_STORE_H
-# define OPENSSL_STORE_H
-# pragma once
+#define OPENSSL_STORE_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_OSSL_STORE_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_OSSL_STORE_H
+#endif
 
-# include <stdarg.h>
-# include <openssl/types.h>
-# include <openssl/pem.h>
-# include <openssl/storeerr.h>
+#include <stdarg.h>
+#include <openssl/types.h>
+#include <openssl/pem.h>
+#include <openssl/storeerr.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*-
  *  The main OSSL_STORE functions.
@@ -42,7 +42,7 @@ typedef struct ossl_store_ctx_st OSSL_STORE_CTX;
  * NULL).
  */
 typedef OSSL_STORE_INFO *(*OSSL_STORE_post_process_info_fn)(OSSL_STORE_INFO *,
-                                                            void *);
+    void *);
 
 /*
  * Open a channel given a URI.  The given UI method will be used any time the
@@ -54,14 +54,14 @@ typedef OSSL_STORE_INFO *(*OSSL_STORE_post_process_info_fn)(OSSL_STORE_INFO *,
  */
 OSSL_STORE_CTX *
 OSSL_STORE_open(const char *uri, const UI_METHOD *ui_method, void *ui_data,
-                OSSL_STORE_post_process_info_fn post_process,
-                void *post_process_data);
+    OSSL_STORE_post_process_info_fn post_process,
+    void *post_process_data);
 OSSL_STORE_CTX *
 OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
-                   const UI_METHOD *ui_method, void *ui_data,
-                   const OSSL_PARAM params[],
-                   OSSL_STORE_post_process_info_fn post_process,
-                   void *post_process_data);
+    const UI_METHOD *ui_method, void *ui_data,
+    const OSSL_PARAM params[],
+    OSSL_STORE_post_process_info_fn post_process,
+    void *post_process_data);
 
 /*
  * Control / fine tune the OSSL_STORE channel.  |cmd| determines what is to be
@@ -69,24 +69,24 @@ OSSL_STORE_open_ex(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
  * determine which loader is used), except for common commands (see below).
  * Each command takes different arguments.
  */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int OSSL_STORE_ctrl(OSSL_STORE_CTX *ctx, int cmd,
-                                          ... /* args */);
+    ... /* args */);
 OSSL_DEPRECATEDIN_3_0 int OSSL_STORE_vctrl(OSSL_STORE_CTX *ctx, int cmd,
-                                           va_list args);
-# endif
+    va_list args);
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
 /*
  * Common ctrl commands that different loaders may choose to support.
  */
 /* int on = 0 or 1; STORE_ctrl(ctx, STORE_C_USE_SECMEM, &on); */
-# define OSSL_STORE_C_USE_SECMEM      1
+#define OSSL_STORE_C_USE_SECMEM 1
 /* Where custom commands start */
-# define OSSL_STORE_C_CUSTOM_START    100
+#define OSSL_STORE_C_CUSTOM_START 100
 
-# endif
+#endif
 
 /*
  * Read one data item (a key, a cert, a CRL) that is supported by the OSSL_STORE
@@ -103,8 +103,8 @@ OSSL_STORE_INFO *OSSL_STORE_load(OSSL_STORE_CTX *ctx);
  * Returns 1 on success, 0 otherwise.
  */
 int OSSL_STORE_delete(const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
-                      const UI_METHOD *ui_method, void *ui_data,
-                      const OSSL_PARAM params[]);
+    const UI_METHOD *ui_method, void *ui_data,
+    const OSSL_PARAM params[]);
 
 /*
  * Check if end of data (end of file) is reached
@@ -138,11 +138,11 @@ int OSSL_STORE_close(OSSL_STORE_CTX *ctx);
  * BIO actually reads.
  */
 OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bio, const char *scheme,
-                                  OSSL_LIB_CTX *libctx, const char *propq,
-                                  const UI_METHOD *ui_method, void *ui_data,
-                                  const OSSL_PARAM params[],
-                                  OSSL_STORE_post_process_info_fn post_process,
-                                  void *post_process_data);
+    OSSL_LIB_CTX *libctx, const char *propq,
+    const UI_METHOD *ui_method, void *ui_data,
+    const OSSL_PARAM params[],
+    OSSL_STORE_post_process_info_fn post_process,
+    void *post_process_data);
 
 /*-
  *  Extracting OpenSSL types from and creating new OSSL_STORE_INFOs
@@ -154,12 +154,12 @@ OSSL_STORE_CTX *OSSL_STORE_attach(BIO *bio, const char *scheme,
  * OSSL_STORE_INFO_NAME is typically found when getting a listing of
  * available "files" / "tokens" / what have you.
  */
-# define OSSL_STORE_INFO_NAME           1   /* char * */
-# define OSSL_STORE_INFO_PARAMS         2   /* EVP_PKEY * */
-# define OSSL_STORE_INFO_PUBKEY         3   /* EVP_PKEY * */
-# define OSSL_STORE_INFO_PKEY           4   /* EVP_PKEY * */
-# define OSSL_STORE_INFO_CERT           5   /* X509 * */
-# define OSSL_STORE_INFO_CRL            6   /* X509_CRL * */
+#define OSSL_STORE_INFO_NAME 1 /* char * */
+#define OSSL_STORE_INFO_PARAMS 2 /* EVP_PKEY * */
+#define OSSL_STORE_INFO_PUBKEY 3 /* EVP_PKEY * */
+#define OSSL_STORE_INFO_PKEY 4 /* EVP_PKEY * */
+#define OSSL_STORE_INFO_CERT 5 /* X509 * */
+#define OSSL_STORE_INFO_CRL 6 /* X509_CRL * */
 
 /*
  * Functions to generate OSSL_STORE_INFOs, one function for each type we
@@ -204,17 +204,16 @@ const char *OSSL_STORE_INFO_type_string(int type);
  */
 void OSSL_STORE_INFO_free(OSSL_STORE_INFO *info);
 
-
 /*-
  *  Functions to construct a search URI from a base URI and search criteria
  *  -----------------------------------------------------------------------
  */
 
 /* OSSL_STORE search types */
-# define OSSL_STORE_SEARCH_BY_NAME              1 /* subject in certs, issuer in CRLs */
-# define OSSL_STORE_SEARCH_BY_ISSUER_SERIAL     2
-# define OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT   3
-# define OSSL_STORE_SEARCH_BY_ALIAS             4
+#define OSSL_STORE_SEARCH_BY_NAME 1 /* subject in certs, issuer in CRLs */
+#define OSSL_STORE_SEARCH_BY_ISSUER_SERIAL 2
+#define OSSL_STORE_SEARCH_BY_KEY_FINGERPRINT 3
+#define OSSL_STORE_SEARCH_BY_ALIAS 4
 
 /* To check what search types the scheme handler supports */
 int OSSL_STORE_supports_search(OSSL_STORE_CTX *ctx, int search_type);
@@ -226,11 +225,12 @@ int OSSL_STORE_supports_search(OSSL_STORE_CTX *ctx, int search_type);
  */
 OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_name(X509_NAME *name);
 OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_issuer_serial(X509_NAME *name,
-                                                      const ASN1_INTEGER
-                                                      *serial);
+    const ASN1_INTEGER
+        *serial);
 OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_key_fingerprint(const EVP_MD *digest,
-                                                        const unsigned char
-                                                        *bytes, size_t len);
+    const unsigned char
+        *bytes,
+    size_t len);
 OSSL_STORE_SEARCH *OSSL_STORE_SEARCH_by_alias(const char *alias);
 
 /* Search term destructor */
@@ -240,9 +240,10 @@ void OSSL_STORE_SEARCH_free(OSSL_STORE_SEARCH *search);
 int OSSL_STORE_SEARCH_get_type(const OSSL_STORE_SEARCH *criterion);
 X509_NAME *OSSL_STORE_SEARCH_get0_name(const OSSL_STORE_SEARCH *criterion);
 const ASN1_INTEGER *OSSL_STORE_SEARCH_get0_serial(const OSSL_STORE_SEARCH
-                                                  *criterion);
+        *criterion);
 const unsigned char *OSSL_STORE_SEARCH_get0_bytes(const OSSL_STORE_SEARCH
-                                                  *criterion, size_t *length);
+                                                      *criterion,
+    size_t *length);
 const char *OSSL_STORE_SEARCH_get0_string(const OSSL_STORE_SEARCH *criterion);
 const EVP_MD *OSSL_STORE_SEARCH_get0_digest(const OSSL_STORE_SEARCH *criterion);
 
@@ -253,7 +254,6 @@ const EVP_MD *OSSL_STORE_SEARCH_get0_digest(const OSSL_STORE_SEARCH *criterion);
 int OSSL_STORE_expect(OSSL_STORE_CTX *ctx, int expected_type);
 int OSSL_STORE_find(OSSL_STORE_CTX *ctx, const OSSL_STORE_SEARCH *search);
 
-
 /*-
  *  Function to fetch a loader and extract data from it
  *  ---------------------------------------------------
@@ -262,23 +262,23 @@ int OSSL_STORE_find(OSSL_STORE_CTX *ctx, const OSSL_STORE_SEARCH *search);
 typedef struct ossl_store_loader_st OSSL_STORE_LOADER;
 
 OSSL_STORE_LOADER *OSSL_STORE_LOADER_fetch(OSSL_LIB_CTX *libctx,
-                                           const char *scheme,
-                                           const char *properties);
+    const char *scheme,
+    const char *properties);
 int OSSL_STORE_LOADER_up_ref(OSSL_STORE_LOADER *loader);
 void OSSL_STORE_LOADER_free(OSSL_STORE_LOADER *loader);
 const OSSL_PROVIDER *OSSL_STORE_LOADER_get0_provider(const OSSL_STORE_LOADER *
-                                                loader);
+        loader);
 const char *OSSL_STORE_LOADER_get0_properties(const OSSL_STORE_LOADER *loader);
 const char *OSSL_STORE_LOADER_get0_description(const OSSL_STORE_LOADER *loader);
 int OSSL_STORE_LOADER_is_a(const OSSL_STORE_LOADER *loader,
-                           const char *scheme);
+    const char *scheme);
 void OSSL_STORE_LOADER_do_all_provided(OSSL_LIB_CTX *libctx,
-                                       void (*fn)(OSSL_STORE_LOADER *loader,
-                                                  void *arg),
-                                       void *arg);
+    void (*fn)(OSSL_STORE_LOADER *loader,
+        void *arg),
+    void *arg);
 int OSSL_STORE_LOADER_names_do_all(const OSSL_STORE_LOADER *loader,
-                                   void (*fn)(const char *name, void *data),
-                                   void *data);
+    void (*fn)(const char *name, void *data),
+    void *data);
 
 /*-
  *  Function to register a loader for the given URI scheme.
@@ -288,68 +288,61 @@ int OSSL_STORE_LOADER_names_do_all(const OSSL_STORE_LOADER *loader,
  *  scheme.
  */
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 
 /* struct ossl_store_loader_ctx_st is defined differently by each loader */
 typedef struct ossl_store_loader_ctx_st OSSL_STORE_LOADER_CTX;
-typedef OSSL_STORE_LOADER_CTX *(*OSSL_STORE_open_fn)
-    (const OSSL_STORE_LOADER *loader, const char *uri,
-     const UI_METHOD *ui_method, void *ui_data);
-typedef OSSL_STORE_LOADER_CTX *(*OSSL_STORE_open_ex_fn)
-    (const OSSL_STORE_LOADER *loader,
-     const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
-     const UI_METHOD *ui_method, void *ui_data);
+typedef OSSL_STORE_LOADER_CTX *(*OSSL_STORE_open_fn)(const OSSL_STORE_LOADER *loader, const char *uri,
+    const UI_METHOD *ui_method, void *ui_data);
+typedef OSSL_STORE_LOADER_CTX *(*OSSL_STORE_open_ex_fn)(const OSSL_STORE_LOADER *loader,
+    const char *uri, OSSL_LIB_CTX *libctx, const char *propq,
+    const UI_METHOD *ui_method, void *ui_data);
 
-typedef OSSL_STORE_LOADER_CTX *(*OSSL_STORE_attach_fn)
-    (const OSSL_STORE_LOADER *loader, BIO *bio,
-     OSSL_LIB_CTX *libctx, const char *propq,
-     const UI_METHOD *ui_method, void *ui_data);
-typedef int (*OSSL_STORE_ctrl_fn)
-    (OSSL_STORE_LOADER_CTX *ctx, int cmd, va_list args);
-typedef int (*OSSL_STORE_expect_fn)
-    (OSSL_STORE_LOADER_CTX *ctx, int expected);
-typedef int (*OSSL_STORE_find_fn)
-    (OSSL_STORE_LOADER_CTX *ctx, const OSSL_STORE_SEARCH *criteria);
-typedef OSSL_STORE_INFO *(*OSSL_STORE_load_fn)
-    (OSSL_STORE_LOADER_CTX *ctx, const UI_METHOD *ui_method, void *ui_data);
+typedef OSSL_STORE_LOADER_CTX *(*OSSL_STORE_attach_fn)(const OSSL_STORE_LOADER *loader, BIO *bio,
+    OSSL_LIB_CTX *libctx, const char *propq,
+    const UI_METHOD *ui_method, void *ui_data);
+typedef int (*OSSL_STORE_ctrl_fn)(OSSL_STORE_LOADER_CTX *ctx, int cmd, va_list args);
+typedef int (*OSSL_STORE_expect_fn)(OSSL_STORE_LOADER_CTX *ctx, int expected);
+typedef int (*OSSL_STORE_find_fn)(OSSL_STORE_LOADER_CTX *ctx, const OSSL_STORE_SEARCH *criteria);
+typedef OSSL_STORE_INFO *(*OSSL_STORE_load_fn)(OSSL_STORE_LOADER_CTX *ctx, const UI_METHOD *ui_method, void *ui_data);
 typedef int (*OSSL_STORE_eof_fn)(OSSL_STORE_LOADER_CTX *ctx);
 typedef int (*OSSL_STORE_error_fn)(OSSL_STORE_LOADER_CTX *ctx);
 typedef int (*OSSL_STORE_close_fn)(OSSL_STORE_LOADER_CTX *ctx);
 
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 OSSL_STORE_LOADER *OSSL_STORE_LOADER_new(ENGINE *e, const char *scheme);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_open(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_open_fn open_function);
+    OSSL_STORE_open_fn open_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_open_ex(OSSL_STORE_LOADER *loader,
-                                  OSSL_STORE_open_ex_fn open_ex_function);
+    OSSL_STORE_open_ex_fn open_ex_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_attach(OSSL_STORE_LOADER *loader,
-                                 OSSL_STORE_attach_fn attach_function);
+    OSSL_STORE_attach_fn attach_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_ctrl(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_ctrl_fn ctrl_function);
+    OSSL_STORE_ctrl_fn ctrl_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_expect(OSSL_STORE_LOADER *loader,
-                                 OSSL_STORE_expect_fn expect_function);
+    OSSL_STORE_expect_fn expect_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_find(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_find_fn find_function);
+    OSSL_STORE_find_fn find_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_load(OSSL_STORE_LOADER *loader,
-                               OSSL_STORE_load_fn load_function);
+    OSSL_STORE_load_fn load_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_eof(OSSL_STORE_LOADER *loader,
-                              OSSL_STORE_eof_fn eof_function);
+    OSSL_STORE_eof_fn eof_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_error(OSSL_STORE_LOADER *loader,
-                                OSSL_STORE_error_fn error_function);
+    OSSL_STORE_error_fn error_function);
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_LOADER_set_close(OSSL_STORE_LOADER *loader,
-                                OSSL_STORE_close_fn close_function);
+    OSSL_STORE_close_fn close_function);
 OSSL_DEPRECATEDIN_3_0
 const ENGINE *OSSL_STORE_LOADER_get0_engine(const OSSL_STORE_LOADER *loader);
 OSSL_DEPRECATEDIN_3_0
@@ -358,20 +351,20 @@ OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_register_loader(OSSL_STORE_LOADER *loader);
 OSSL_DEPRECATEDIN_3_0
 OSSL_STORE_LOADER *OSSL_STORE_unregister_loader(const char *scheme);
-# endif
+#endif
 
 /*-
  *  Functions to list STORE loaders
  *  -------------------------------
  */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int OSSL_STORE_do_all_loaders(void (*do_function)(const OSSL_STORE_LOADER *loader,
-                                                  void *do_arg),
-                              void *do_arg);
-# endif
+                                  void *do_arg),
+    void *do_arg);
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h
index 00529c88b59a..a61bee11125f 100644
--- a/include/openssl/storeerr.h
+++ b/include/openssl/storeerr.h
@@ -9,41 +9,39 @@
  */
 
 #ifndef OPENSSL_STOREERR_H
-# define OPENSSL_STOREERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_STOREERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * OSSL_STORE reason codes.
  */
-# define OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE              107
-# define OSSL_STORE_R_BAD_PASSWORD_READ                   115
-# define OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC          113
-# define OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST 121
-# define OSSL_STORE_R_INVALID_SCHEME                      106
-# define OSSL_STORE_R_IS_NOT_A                            112
-# define OSSL_STORE_R_LOADER_INCOMPLETE                   116
-# define OSSL_STORE_R_LOADING_STARTED                     117
-# define OSSL_STORE_R_NOT_A_CERTIFICATE                   100
-# define OSSL_STORE_R_NOT_A_CRL                           101
-# define OSSL_STORE_R_NOT_A_NAME                          103
-# define OSSL_STORE_R_NOT_A_PRIVATE_KEY                   102
-# define OSSL_STORE_R_NOT_A_PUBLIC_KEY                    122
-# define OSSL_STORE_R_NOT_PARAMETERS                      104
-# define OSSL_STORE_R_NO_LOADERS_FOUND                    123
-# define OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR           114
-# define OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE               108
-# define OSSL_STORE_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES 119
-# define OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED 109
-# define OSSL_STORE_R_UNREGISTERED_SCHEME                 105
-# define OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE            110
-# define OSSL_STORE_R_UNSUPPORTED_OPERATION               118
-# define OSSL_STORE_R_UNSUPPORTED_SEARCH_TYPE             120
-# define OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED           111
+#define OSSL_STORE_R_AMBIGUOUS_CONTENT_TYPE 107
+#define OSSL_STORE_R_BAD_PASSWORD_READ 115
+#define OSSL_STORE_R_ERROR_VERIFYING_PKCS12_MAC 113
+#define OSSL_STORE_R_FINGERPRINT_SIZE_DOES_NOT_MATCH_DIGEST 121
+#define OSSL_STORE_R_INVALID_SCHEME 106
+#define OSSL_STORE_R_IS_NOT_A 112
+#define OSSL_STORE_R_LOADER_INCOMPLETE 116
+#define OSSL_STORE_R_LOADING_STARTED 117
+#define OSSL_STORE_R_NOT_A_CERTIFICATE 100
+#define OSSL_STORE_R_NOT_A_CRL 101
+#define OSSL_STORE_R_NOT_A_NAME 103
+#define OSSL_STORE_R_NOT_A_PRIVATE_KEY 102
+#define OSSL_STORE_R_NOT_A_PUBLIC_KEY 122
+#define OSSL_STORE_R_NOT_PARAMETERS 104
+#define OSSL_STORE_R_NO_LOADERS_FOUND 123
+#define OSSL_STORE_R_PASSPHRASE_CALLBACK_ERROR 114
+#define OSSL_STORE_R_PATH_MUST_BE_ABSOLUTE 108
+#define OSSL_STORE_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES 119
+#define OSSL_STORE_R_UI_PROCESS_INTERRUPTED_OR_CANCELLED 109
+#define OSSL_STORE_R_UNREGISTERED_SCHEME 105
+#define OSSL_STORE_R_UNSUPPORTED_CONTENT_TYPE 110
+#define OSSL_STORE_R_UNSUPPORTED_OPERATION 118
+#define OSSL_STORE_R_UNSUPPORTED_SEARCH_TYPE 120
+#define OSSL_STORE_R_URI_AUTHORITY_UNSUPPORTED 111
 
 #endif
diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h
index 816f8f998910..d04139545385 100644
--- a/include/openssl/symhacks.h
+++ b/include/openssl/symhacks.h
@@ -8,32 +8,32 @@
  */
 
 #ifndef OPENSSL_SYMHACKS_H
-# define OPENSSL_SYMHACKS_H
-# pragma once
+#define OPENSSL_SYMHACKS_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_SYMHACKS_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_SYMHACKS_H
+#endif
 
-# include <openssl/e_os2.h>
+#include <openssl/e_os2.h>
 
 /* Case insensitive linking causes problems.... */
-# if defined(OPENSSL_SYS_VMS)
-#  undef ERR_load_CRYPTO_strings
-#  define ERR_load_CRYPTO_strings                 ERR_load_CRYPTOlib_strings
-#  undef OCSP_crlID_new
-#  define OCSP_crlID_new                          OCSP_crlID2_new
+#if defined(OPENSSL_SYS_VMS)
+#undef ERR_load_CRYPTO_strings
+#define ERR_load_CRYPTO_strings ERR_load_CRYPTOlib_strings
+#undef OCSP_crlID_new
+#define OCSP_crlID_new OCSP_crlID2_new
 
-#  undef d2i_ECPARAMETERS
-#  define d2i_ECPARAMETERS                        d2i_UC_ECPARAMETERS
-#  undef i2d_ECPARAMETERS
-#  define i2d_ECPARAMETERS                        i2d_UC_ECPARAMETERS
-#  undef d2i_ECPKPARAMETERS
-#  define d2i_ECPKPARAMETERS                      d2i_UC_ECPKPARAMETERS
-#  undef i2d_ECPKPARAMETERS
-#  define i2d_ECPKPARAMETERS                      i2d_UC_ECPKPARAMETERS
+#undef d2i_ECPARAMETERS
+#define d2i_ECPARAMETERS d2i_UC_ECPARAMETERS
+#undef i2d_ECPARAMETERS
+#define i2d_ECPARAMETERS i2d_UC_ECPARAMETERS
+#undef d2i_ECPKPARAMETERS
+#define d2i_ECPKPARAMETERS d2i_UC_ECPKPARAMETERS
+#undef i2d_ECPKPARAMETERS
+#define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS
 
-# endif
+#endif
 
-#endif                          /* ! defined HEADER_VMS_IDHACKS_H */
+#endif /* ! defined HEADER_VMS_IDHACKS_H */
diff --git a/include/openssl/thread.h b/include/openssl/thread.h
index 3926ce54d78b..6d86e0e35518 100644
--- a/include/openssl/thread.h
+++ b/include/openssl/thread.h
@@ -9,23 +9,23 @@
  */
 
 #ifndef OPENSSL_THREAD_H
-# define OPENSSL_THREAD_H
+#define OPENSSL_THREAD_H
 
-# define OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL (1U<<0)
-# define OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN (1U<<1)
+#define OSSL_THREAD_SUPPORT_FLAG_THREAD_POOL (1U << 0)
+#define OSSL_THREAD_SUPPORT_FLAG_DEFAULT_SPAWN (1U << 1)
 
-# include <openssl/types.h>
+#include <openssl/types.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 uint32_t OSSL_get_thread_support_flags(void);
 int OSSL_set_max_threads(OSSL_LIB_CTX *ctx, uint64_t max_threads);
 uint64_t OSSL_get_max_threads(OSSL_LIB_CTX *ctx);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif /* OPENSSL_THREAD_H */
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 8e9b110bb303..931ee790fb01 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -10,243 +10,242 @@
  */
 
 #ifndef OPENSSL_TLS1_H
-# define OPENSSL_TLS1_H
-# pragma once
+#define OPENSSL_TLS1_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_TLS1_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_TLS1_H
+#endif
 
-# include <openssl/buffer.h>
-# include <openssl/x509.h>
-# include <openssl/prov_ssl.h>
+#include <openssl/buffer.h>
+#include <openssl/x509.h>
+#include <openssl/prov_ssl.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Default security level if not overridden at config time */
-# ifndef OPENSSL_TLS_SECURITY_LEVEL
-#  define OPENSSL_TLS_SECURITY_LEVEL 2
-# endif
+#ifndef OPENSSL_TLS_SECURITY_LEVEL
+#define OPENSSL_TLS_SECURITY_LEVEL 2
+#endif
 
 /* TLS*_VERSION constants are defined in prov_ssl.h */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define TLS_MAX_VERSION                TLS1_3_VERSION
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define TLS_MAX_VERSION TLS1_3_VERSION
+#endif
 
 /* Special value for method supporting multiple versions */
-# define TLS_ANY_VERSION                 0x10000
+#define TLS_ANY_VERSION 0x10000
 
-# define TLS1_VERSION_MAJOR              0x03
-# define TLS1_VERSION_MINOR              0x01
+#define TLS1_VERSION_MAJOR 0x03
+#define TLS1_VERSION_MINOR 0x01
 
-# define TLS1_1_VERSION_MAJOR            0x03
-# define TLS1_1_VERSION_MINOR            0x02
+#define TLS1_1_VERSION_MAJOR 0x03
+#define TLS1_1_VERSION_MINOR 0x02
 
-# define TLS1_2_VERSION_MAJOR            0x03
-# define TLS1_2_VERSION_MINOR            0x03
+#define TLS1_2_VERSION_MAJOR 0x03
+#define TLS1_2_VERSION_MINOR 0x03
 
-# define TLS1_get_version(s) \
-        ((SSL_version(s) >> 8) == TLS1_VERSION_MAJOR ? SSL_version(s) : 0)
+#define TLS1_get_version(s) \
+    ((SSL_version(s) >> 8) == TLS1_VERSION_MAJOR ? SSL_version(s) : 0)
 
-# define TLS1_get_client_version(s) \
-        ((SSL_client_version(s) >> 8) == TLS1_VERSION_MAJOR ? SSL_client_version(s) : 0)
+#define TLS1_get_client_version(s) \
+    ((SSL_client_version(s) >> 8) == TLS1_VERSION_MAJOR ? SSL_client_version(s) : 0)
 
-# define TLS1_AD_DECRYPTION_FAILED       21
-# define TLS1_AD_RECORD_OVERFLOW         22
-# define TLS1_AD_UNKNOWN_CA              48/* fatal */
-# define TLS1_AD_ACCESS_DENIED           49/* fatal */
-# define TLS1_AD_DECODE_ERROR            50/* fatal */
-# define TLS1_AD_DECRYPT_ERROR           51
-# define TLS1_AD_EXPORT_RESTRICTION      60/* fatal */
-# define TLS1_AD_PROTOCOL_VERSION        70/* fatal */
-# define TLS1_AD_INSUFFICIENT_SECURITY   71/* fatal */
-# define TLS1_AD_INTERNAL_ERROR          80/* fatal */
-# define TLS1_AD_INAPPROPRIATE_FALLBACK  86/* fatal */
-# define TLS1_AD_USER_CANCELLED          90
-# define TLS1_AD_NO_RENEGOTIATION        100
+#define TLS1_AD_DECRYPTION_FAILED 21
+#define TLS1_AD_RECORD_OVERFLOW 22
+#define TLS1_AD_UNKNOWN_CA 48 /* fatal */
+#define TLS1_AD_ACCESS_DENIED 49 /* fatal */
+#define TLS1_AD_DECODE_ERROR 50 /* fatal */
+#define TLS1_AD_DECRYPT_ERROR 51
+#define TLS1_AD_EXPORT_RESTRICTION 60 /* fatal */
+#define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */
+#define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */
+#define TLS1_AD_INTERNAL_ERROR 80 /* fatal */
+#define TLS1_AD_INAPPROPRIATE_FALLBACK 86 /* fatal */
+#define TLS1_AD_USER_CANCELLED 90
+#define TLS1_AD_NO_RENEGOTIATION 100
 /* TLSv1.3 alerts */
-# define TLS13_AD_MISSING_EXTENSION      109 /* fatal */
-# define TLS13_AD_CERTIFICATE_REQUIRED   116 /* fatal */
+#define TLS13_AD_MISSING_EXTENSION 109 /* fatal */
+#define TLS13_AD_CERTIFICATE_REQUIRED 116 /* fatal */
 /* codes 110-114 are from RFC3546 */
-# define TLS1_AD_UNSUPPORTED_EXTENSION   110
-# define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
-# define TLS1_AD_UNRECOGNIZED_NAME       112
-# define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
-# define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
-# define TLS1_AD_UNKNOWN_PSK_IDENTITY    115/* fatal */
-# define TLS1_AD_NO_APPLICATION_PROTOCOL 120 /* fatal */
+#define TLS1_AD_UNSUPPORTED_EXTENSION 110
+#define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
+#define TLS1_AD_UNRECOGNIZED_NAME 112
+#define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
+#define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
+#define TLS1_AD_UNKNOWN_PSK_IDENTITY 115 /* fatal */
+#define TLS1_AD_NO_APPLICATION_PROTOCOL 120 /* fatal */
 
 /* ExtensionType values from RFC3546 / RFC4366 / RFC6066 */
-# define TLSEXT_TYPE_server_name                 0
-# define TLSEXT_TYPE_max_fragment_length         1
-# define TLSEXT_TYPE_client_certificate_url      2
-# define TLSEXT_TYPE_trusted_ca_keys             3
-# define TLSEXT_TYPE_truncated_hmac              4
-# define TLSEXT_TYPE_status_request              5
+#define TLSEXT_TYPE_server_name 0
+#define TLSEXT_TYPE_max_fragment_length 1
+#define TLSEXT_TYPE_client_certificate_url 2
+#define TLSEXT_TYPE_trusted_ca_keys 3
+#define TLSEXT_TYPE_truncated_hmac 4
+#define TLSEXT_TYPE_status_request 5
 /* ExtensionType values from RFC4681 */
-# define TLSEXT_TYPE_user_mapping                6
+#define TLSEXT_TYPE_user_mapping 6
 /* ExtensionType values from RFC5878 */
-# define TLSEXT_TYPE_client_authz                7
-# define TLSEXT_TYPE_server_authz                8
+#define TLSEXT_TYPE_client_authz 7
+#define TLSEXT_TYPE_server_authz 8
 /* ExtensionType values from RFC6091 */
-# define TLSEXT_TYPE_cert_type           9
+#define TLSEXT_TYPE_cert_type 9
 
 /* ExtensionType values from RFC4492 */
 /*
  * Prior to TLSv1.3 the supported_groups extension was known as
  * elliptic_curves
  */
-# define TLSEXT_TYPE_supported_groups            10
-# define TLSEXT_TYPE_elliptic_curves             TLSEXT_TYPE_supported_groups
-# define TLSEXT_TYPE_ec_point_formats            11
-
+#define TLSEXT_TYPE_supported_groups 10
+#define TLSEXT_TYPE_elliptic_curves TLSEXT_TYPE_supported_groups
+#define TLSEXT_TYPE_ec_point_formats 11
 
 /* ExtensionType value from RFC5054 */
-# define TLSEXT_TYPE_srp                         12
+#define TLSEXT_TYPE_srp 12
 
 /* ExtensionType values from RFC5246 */
-# define TLSEXT_TYPE_signature_algorithms        13
+#define TLSEXT_TYPE_signature_algorithms 13
 
 /* ExtensionType value from RFC5764 */
-# define TLSEXT_TYPE_use_srtp    14
+#define TLSEXT_TYPE_use_srtp 14
 
 /* ExtensionType value from RFC7301 */
-# define TLSEXT_TYPE_application_layer_protocol_negotiation 16
+#define TLSEXT_TYPE_application_layer_protocol_negotiation 16
 
 /*
  * Extension type for Certificate Transparency
  * https://tools.ietf.org/html/rfc6962#section-3.3.1
  */
-# define TLSEXT_TYPE_signed_certificate_timestamp    18
+#define TLSEXT_TYPE_signed_certificate_timestamp 18
 
 /*
  * Extension type for Raw Public Keys
  * https://tools.ietf.org/html/rfc7250
  * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
  */
-# define TLSEXT_TYPE_client_cert_type   19
-# define TLSEXT_TYPE_server_cert_type   20
+#define TLSEXT_TYPE_client_cert_type 19
+#define TLSEXT_TYPE_server_cert_type 20
 
 /*
  * ExtensionType value for TLS padding extension.
  * http://tools.ietf.org/html/draft-agl-tls-padding
  */
-# define TLSEXT_TYPE_padding     21
+#define TLSEXT_TYPE_padding 21
 
 /* ExtensionType value from RFC7366 */
-# define TLSEXT_TYPE_encrypt_then_mac    22
+#define TLSEXT_TYPE_encrypt_then_mac 22
 
 /* ExtensionType value from RFC7627 */
-# define TLSEXT_TYPE_extended_master_secret      23
+#define TLSEXT_TYPE_extended_master_secret 23
 
 /* ExtensionType value from RFC8879 */
-# define TLSEXT_TYPE_compress_certificate        27
+#define TLSEXT_TYPE_compress_certificate 27
 
 /* ExtensionType value from RFC4507 */
-# define TLSEXT_TYPE_session_ticket              35
+#define TLSEXT_TYPE_session_ticket 35
 
 /* As defined for TLS1.3 */
-# define TLSEXT_TYPE_psk                         41
-# define TLSEXT_TYPE_early_data                  42
-# define TLSEXT_TYPE_supported_versions          43
-# define TLSEXT_TYPE_cookie                      44
-# define TLSEXT_TYPE_psk_kex_modes               45
-# define TLSEXT_TYPE_certificate_authorities     47
-# define TLSEXT_TYPE_post_handshake_auth         49
-# define TLSEXT_TYPE_signature_algorithms_cert   50
-# define TLSEXT_TYPE_key_share                   51
-# define TLSEXT_TYPE_quic_transport_parameters   57
+#define TLSEXT_TYPE_psk 41
+#define TLSEXT_TYPE_early_data 42
+#define TLSEXT_TYPE_supported_versions 43
+#define TLSEXT_TYPE_cookie 44
+#define TLSEXT_TYPE_psk_kex_modes 45
+#define TLSEXT_TYPE_certificate_authorities 47
+#define TLSEXT_TYPE_post_handshake_auth 49
+#define TLSEXT_TYPE_signature_algorithms_cert 50
+#define TLSEXT_TYPE_key_share 51
+#define TLSEXT_TYPE_quic_transport_parameters 57
 
 /* Temporary extension type */
-# define TLSEXT_TYPE_renegotiate                 0xff01
+#define TLSEXT_TYPE_renegotiate 0xff01
 
-# ifndef OPENSSL_NO_NEXTPROTONEG
+#ifndef OPENSSL_NO_NEXTPROTONEG
 /* This is not an IANA defined extension number */
-#  define TLSEXT_TYPE_next_proto_neg              13172
-# endif
+#define TLSEXT_TYPE_next_proto_neg 13172
+#endif
 
 /* NameType value from RFC3546 */
-# define TLSEXT_NAMETYPE_host_name 0
+#define TLSEXT_NAMETYPE_host_name 0
 /* status request value from RFC3546 */
-# define TLSEXT_STATUSTYPE_ocsp 1
+#define TLSEXT_STATUSTYPE_ocsp 1
 
 /* ECPointFormat values from RFC4492 */
-# define TLSEXT_ECPOINTFORMAT_first                      0
-# define TLSEXT_ECPOINTFORMAT_uncompressed               0
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
-# define TLSEXT_ECPOINTFORMAT_last                       2
+#define TLSEXT_ECPOINTFORMAT_first 0
+#define TLSEXT_ECPOINTFORMAT_uncompressed 0
+#define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime 1
+#define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2 2
+#define TLSEXT_ECPOINTFORMAT_last 2
 
 /* Signature and hash algorithms from RFC5246 */
-# define TLSEXT_signature_anonymous                      0
-# define TLSEXT_signature_rsa                            1
-# define TLSEXT_signature_dsa                            2
-# define TLSEXT_signature_ecdsa                          3
-# define TLSEXT_signature_gostr34102001                  237
-# define TLSEXT_signature_gostr34102012_256              238
-# define TLSEXT_signature_gostr34102012_512              239
+#define TLSEXT_signature_anonymous 0
+#define TLSEXT_signature_rsa 1
+#define TLSEXT_signature_dsa 2
+#define TLSEXT_signature_ecdsa 3
+#define TLSEXT_signature_gostr34102001 237
+#define TLSEXT_signature_gostr34102012_256 238
+#define TLSEXT_signature_gostr34102012_512 239
 
 /* Total number of different signature algorithms */
-# define TLSEXT_signature_num                            7
+#define TLSEXT_signature_num 7
 
-# define TLSEXT_hash_none                                0
-# define TLSEXT_hash_md5                                 1
-# define TLSEXT_hash_sha1                                2
-# define TLSEXT_hash_sha224                              3
-# define TLSEXT_hash_sha256                              4
-# define TLSEXT_hash_sha384                              5
-# define TLSEXT_hash_sha512                              6
-# define TLSEXT_hash_gostr3411                           237
-# define TLSEXT_hash_gostr34112012_256                   238
-# define TLSEXT_hash_gostr34112012_512                   239
+#define TLSEXT_hash_none 0
+#define TLSEXT_hash_md5 1
+#define TLSEXT_hash_sha1 2
+#define TLSEXT_hash_sha224 3
+#define TLSEXT_hash_sha256 4
+#define TLSEXT_hash_sha384 5
+#define TLSEXT_hash_sha512 6
+#define TLSEXT_hash_gostr3411 237
+#define TLSEXT_hash_gostr34112012_256 238
+#define TLSEXT_hash_gostr34112012_512 239
 
 /* Total number of different digest algorithms */
 
-# define TLSEXT_hash_num                                 10
+#define TLSEXT_hash_num 10
 
 /* Possible compression values from RFC8879 */
 /* Not defined in RFC8879, but used internally for no-compression */
-# define TLSEXT_comp_cert_none                            0
-# define TLSEXT_comp_cert_zlib                            1
-# define TLSEXT_comp_cert_brotli                          2
-# define TLSEXT_comp_cert_zstd                            3
+#define TLSEXT_comp_cert_none 0
+#define TLSEXT_comp_cert_zlib 1
+#define TLSEXT_comp_cert_brotli 2
+#define TLSEXT_comp_cert_zstd 3
 /* one more than the number of defined values - used as size of 0-terminated array */
-# define TLSEXT_comp_cert_limit                           4
+#define TLSEXT_comp_cert_limit 4
 
 /* Flag set for unrecognised algorithms */
-# define TLSEXT_nid_unknown                              0x1000000
+#define TLSEXT_nid_unknown 0x1000000
 
 /* ECC curves */
 
-# define TLSEXT_curve_P_256                              23
-# define TLSEXT_curve_P_384                              24
+#define TLSEXT_curve_P_256 23
+#define TLSEXT_curve_P_384 24
 
 /* OpenSSL value to disable maximum fragment length extension */
-# define TLSEXT_max_fragment_length_DISABLED    0
+#define TLSEXT_max_fragment_length_DISABLED 0
 /* Allowed values for max fragment length extension */
-# define TLSEXT_max_fragment_length_512         1
-# define TLSEXT_max_fragment_length_1024        2
-# define TLSEXT_max_fragment_length_2048        3
-# define TLSEXT_max_fragment_length_4096        4
+#define TLSEXT_max_fragment_length_512 1
+#define TLSEXT_max_fragment_length_1024 2
+#define TLSEXT_max_fragment_length_2048 3
+#define TLSEXT_max_fragment_length_4096 4
 /* OpenSSL value for unset maximum fragment length extension */
-# define TLSEXT_max_fragment_length_UNSPECIFIED 255
+#define TLSEXT_max_fragment_length_UNSPECIFIED 255
 
 /*
  * TLS Certificate Type (for RFC7250)
  * https://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml#tls-extensiontype-values-3
  */
-# define TLSEXT_cert_type_x509         0
-# define TLSEXT_cert_type_pgp          1 /* recognized, but not supported */
-# define TLSEXT_cert_type_rpk          2
-# define TLSEXT_cert_type_1609dot2     3 /* recognized, but not supported */
+#define TLSEXT_cert_type_x509 0
+#define TLSEXT_cert_type_pgp 1 /* recognized, but not supported */
+#define TLSEXT_cert_type_rpk 2
+#define TLSEXT_cert_type_1609dot2 3 /* recognized, but not supported */
 
 int SSL_CTX_set_tlsext_max_fragment_length(SSL_CTX *ctx, uint8_t mode);
 int SSL_set_tlsext_max_fragment_length(SSL *ssl, uint8_t mode);
 
-# define TLSEXT_MAXLEN_host_name 255
+#define TLSEXT_MAXLEN_host_name 255
 
 __owur const char *SSL_get_servername(const SSL *s, const int type);
 __owur int SSL_get_servername_type(const SSL *s);
@@ -258,9 +257,9 @@ __owur int SSL_get_servername_type(const SSL *s);
  * 0 or -1 otherwise.
  */
 __owur int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
-                                      const char *label, size_t llen,
-                                      const unsigned char *context,
-                                      size_t contextlen, int use_context);
+    const char *label, size_t llen,
+    const unsigned char *context,
+    size_t contextlen, int use_context);
 
 /*
  * SSL_export_keying_material_early exports a value derived from the
@@ -270,587 +269,584 @@ __owur int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
  * returns 1 on success and 0 otherwise.
  */
 __owur int SSL_export_keying_material_early(SSL *s, unsigned char *out,
-                                            size_t olen, const char *label,
-                                            size_t llen,
-                                            const unsigned char *context,
-                                            size_t contextlen);
+    size_t olen, const char *label,
+    size_t llen,
+    const unsigned char *context,
+    size_t contextlen);
 
 int SSL_get_peer_signature_type_nid(const SSL *s, int *pnid);
 int SSL_get_signature_type_nid(const SSL *s, int *pnid);
 
 int SSL_get_sigalgs(SSL *s, int idx,
-                    int *psign, int *phash, int *psignandhash,
-                    unsigned char *rsig, unsigned char *rhash);
+    int *psign, int *phash, int *psignandhash,
+    unsigned char *rsig, unsigned char *rhash);
 
 char *SSL_get1_builtin_sigalgs(OSSL_LIB_CTX *libctx);
 
 int SSL_get_shared_sigalgs(SSL *s, int idx,
-                           int *psign, int *phash, int *psignandhash,
-                           unsigned char *rsig, unsigned char *rhash);
+    int *psign, int *phash, int *psignandhash,
+    unsigned char *rsig, unsigned char *rhash);
 
 __owur int SSL_check_chain(SSL *s, X509 *x, EVP_PKEY *pk, STACK_OF(X509) *chain);
 
-# define SSL_set_tlsext_host_name(s,name) \
-        SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,\
-                (void *)name)
+#define SSL_set_tlsext_host_name(s, name)                                \
+    SSL_ctrl(s, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, \
+        (void *)name)
 
-# define SSL_set_tlsext_debug_callback(ssl, cb) \
-        SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,\
-                (void (*)(void))cb)
+#define SSL_set_tlsext_debug_callback(ssl, cb)           \
+    SSL_callback_ctrl(ssl, SSL_CTRL_SET_TLSEXT_DEBUG_CB, \
+        (void (*)(void))cb)
 
-# define SSL_set_tlsext_debug_arg(ssl, arg) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0,arg)
+#define SSL_set_tlsext_debug_arg(ssl, arg) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_DEBUG_ARG, 0, arg)
 
-# define SSL_get_tlsext_status_type(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE,0,NULL)
+#define SSL_get_tlsext_status_type(ssl) \
+    SSL_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE, 0, NULL)
 
-# define SSL_set_tlsext_status_type(ssl, type) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type,NULL)
+#define SSL_set_tlsext_status_type(ssl, type) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, type, NULL)
 
-# define SSL_get_tlsext_status_exts(ssl, arg) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0,arg)
+#define SSL_get_tlsext_status_exts(ssl, arg) \
+    SSL_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS, 0, arg)
 
-# define SSL_set_tlsext_status_exts(ssl, arg) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0,arg)
+#define SSL_set_tlsext_status_exts(ssl, arg) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS, 0, arg)
 
-# define SSL_get_tlsext_status_ids(ssl, arg) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0,arg)
+#define SSL_get_tlsext_status_ids(ssl, arg) \
+    SSL_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS, 0, arg)
 
-# define SSL_set_tlsext_status_ids(ssl, arg) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0,arg)
+#define SSL_set_tlsext_status_ids(ssl, arg) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS, 0, arg)
 
-# define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0,arg)
+#define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
+    SSL_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP, 0, arg)
 
-# define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen,arg)
+#define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
+    SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP, arglen, arg)
 
-# define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \
-        SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,\
-                (void (*)(void))cb)
+#define SSL_CTX_set_tlsext_servername_callback(ctx, cb)           \
+    SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_CB, \
+        (void (*)(void))cb)
 
-# define SSL_TLSEXT_ERR_OK 0
-# define SSL_TLSEXT_ERR_ALERT_WARNING 1
-# define SSL_TLSEXT_ERR_ALERT_FATAL 2
-# define SSL_TLSEXT_ERR_NOACK 3
+#define SSL_TLSEXT_ERR_OK 0
+#define SSL_TLSEXT_ERR_ALERT_WARNING 1
+#define SSL_TLSEXT_ERR_ALERT_FATAL 2
+#define SSL_TLSEXT_ERR_NOACK 3
 
-# define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0,arg)
+#define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, arg)
 
-# define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_TICKET_KEYS,keylen,keys)
-# define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_TICKET_KEYS,keylen,keys)
+#define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_GET_TLSEXT_TICKET_KEYS, keylen, keys)
+#define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
+    SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_TICKET_KEYS, keylen, keys)
 
-# define SSL_CTX_get_tlsext_status_cb(ssl, cb) \
-        SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0,(void *)cb)
-# define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
-        SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,\
-                (void (*)(void))cb)
+#define SSL_CTX_get_tlsext_status_cb(ssl, cb) \
+    SSL_CTX_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB, 0, (void *)cb)
+#define SSL_CTX_set_tlsext_status_cb(ssl, cb)                     \
+    SSL_CTX_callback_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB, \
+        (void (*)(void))cb)
 
-# define SSL_CTX_get_tlsext_status_arg(ssl, arg) \
-        SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG,0,arg)
-# define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
-        SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0,arg)
+#define SSL_CTX_get_tlsext_status_arg(ssl, arg) \
+    SSL_CTX_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG, 0, arg)
+#define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
+    SSL_CTX_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG, 0, arg)
 
-# define SSL_CTX_set_tlsext_status_type(ssl, type) \
-        SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type,NULL)
+#define SSL_CTX_set_tlsext_status_type(ssl, type) \
+    SSL_CTX_ctrl(ssl, SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, type, NULL)
 
-# define SSL_CTX_get_tlsext_status_type(ssl) \
-        SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE,0,NULL)
+#define SSL_CTX_get_tlsext_status_type(ssl) \
+    SSL_CTX_ctrl(ssl, SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE, 0, NULL)
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
-        SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,\
-                (void (*)(void))cb)
-# endif
-int SSL_CTX_set_tlsext_ticket_key_evp_cb
-    (SSL_CTX *ctx, int (*fp)(SSL *, unsigned char *, unsigned char *,
-                             EVP_CIPHER_CTX *, EVP_MAC_CTX *, int));
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb)                 \
+    SSL_CTX_callback_ctrl(ssl, SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB, \
+        (void (*)(void))cb)
+#endif
+int SSL_CTX_set_tlsext_ticket_key_evp_cb(SSL_CTX *ctx, int (*fp)(SSL *, unsigned char *, unsigned char *, EVP_CIPHER_CTX *, EVP_MAC_CTX *, int));
 
 /* PSK ciphersuites from 4279 */
-# define TLS1_CK_PSK_WITH_RC4_128_SHA                    0x0300008A
-# define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA               0x0300008B
-# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C
-# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D
-# define TLS1_CK_DHE_PSK_WITH_RC4_128_SHA                0x0300008E
-# define TLS1_CK_DHE_PSK_WITH_3DES_EDE_CBC_SHA           0x0300008F
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA            0x03000090
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA            0x03000091
-# define TLS1_CK_RSA_PSK_WITH_RC4_128_SHA                0x03000092
-# define TLS1_CK_RSA_PSK_WITH_3DES_EDE_CBC_SHA           0x03000093
-# define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA            0x03000094
-# define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA            0x03000095
+#define TLS1_CK_PSK_WITH_RC4_128_SHA 0x0300008A
+#define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA 0x0300008B
+#define TLS1_CK_PSK_WITH_AES_128_CBC_SHA 0x0300008C
+#define TLS1_CK_PSK_WITH_AES_256_CBC_SHA 0x0300008D
+#define TLS1_CK_DHE_PSK_WITH_RC4_128_SHA 0x0300008E
+#define TLS1_CK_DHE_PSK_WITH_3DES_EDE_CBC_SHA 0x0300008F
+#define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA 0x03000090
+#define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA 0x03000091
+#define TLS1_CK_RSA_PSK_WITH_RC4_128_SHA 0x03000092
+#define TLS1_CK_RSA_PSK_WITH_3DES_EDE_CBC_SHA 0x03000093
+#define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA 0x03000094
+#define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA 0x03000095
 
 /* PSK ciphersuites from 5487 */
-# define TLS1_CK_PSK_WITH_AES_128_GCM_SHA256             0x030000A8
-# define TLS1_CK_PSK_WITH_AES_256_GCM_SHA384             0x030000A9
-# define TLS1_CK_DHE_PSK_WITH_AES_128_GCM_SHA256         0x030000AA
-# define TLS1_CK_DHE_PSK_WITH_AES_256_GCM_SHA384         0x030000AB
-# define TLS1_CK_RSA_PSK_WITH_AES_128_GCM_SHA256         0x030000AC
-# define TLS1_CK_RSA_PSK_WITH_AES_256_GCM_SHA384         0x030000AD
-# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA256             0x030000AE
-# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA384             0x030000AF
-# define TLS1_CK_PSK_WITH_NULL_SHA256                    0x030000B0
-# define TLS1_CK_PSK_WITH_NULL_SHA384                    0x030000B1
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA256         0x030000B2
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA384         0x030000B3
-# define TLS1_CK_DHE_PSK_WITH_NULL_SHA256                0x030000B4
-# define TLS1_CK_DHE_PSK_WITH_NULL_SHA384                0x030000B5
-# define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA256         0x030000B6
-# define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA384         0x030000B7
-# define TLS1_CK_RSA_PSK_WITH_NULL_SHA256                0x030000B8
-# define TLS1_CK_RSA_PSK_WITH_NULL_SHA384                0x030000B9
+#define TLS1_CK_PSK_WITH_AES_128_GCM_SHA256 0x030000A8
+#define TLS1_CK_PSK_WITH_AES_256_GCM_SHA384 0x030000A9
+#define TLS1_CK_DHE_PSK_WITH_AES_128_GCM_SHA256 0x030000AA
+#define TLS1_CK_DHE_PSK_WITH_AES_256_GCM_SHA384 0x030000AB
+#define TLS1_CK_RSA_PSK_WITH_AES_128_GCM_SHA256 0x030000AC
+#define TLS1_CK_RSA_PSK_WITH_AES_256_GCM_SHA384 0x030000AD
+#define TLS1_CK_PSK_WITH_AES_128_CBC_SHA256 0x030000AE
+#define TLS1_CK_PSK_WITH_AES_256_CBC_SHA384 0x030000AF
+#define TLS1_CK_PSK_WITH_NULL_SHA256 0x030000B0
+#define TLS1_CK_PSK_WITH_NULL_SHA384 0x030000B1
+#define TLS1_CK_DHE_PSK_WITH_AES_128_CBC_SHA256 0x030000B2
+#define TLS1_CK_DHE_PSK_WITH_AES_256_CBC_SHA384 0x030000B3
+#define TLS1_CK_DHE_PSK_WITH_NULL_SHA256 0x030000B4
+#define TLS1_CK_DHE_PSK_WITH_NULL_SHA384 0x030000B5
+#define TLS1_CK_RSA_PSK_WITH_AES_128_CBC_SHA256 0x030000B6
+#define TLS1_CK_RSA_PSK_WITH_AES_256_CBC_SHA384 0x030000B7
+#define TLS1_CK_RSA_PSK_WITH_NULL_SHA256 0x030000B8
+#define TLS1_CK_RSA_PSK_WITH_NULL_SHA384 0x030000B9
 
 /* NULL PSK ciphersuites from RFC4785 */
-# define TLS1_CK_PSK_WITH_NULL_SHA                       0x0300002C
-# define TLS1_CK_DHE_PSK_WITH_NULL_SHA                   0x0300002D
-# define TLS1_CK_RSA_PSK_WITH_NULL_SHA                   0x0300002E
+#define TLS1_CK_PSK_WITH_NULL_SHA 0x0300002C
+#define TLS1_CK_DHE_PSK_WITH_NULL_SHA 0x0300002D
+#define TLS1_CK_RSA_PSK_WITH_NULL_SHA 0x0300002E
 
 /* AES ciphersuites from RFC3268 */
-# define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA                0x03000032
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA                0x03000033
-# define TLS1_CK_ADH_WITH_AES_128_SHA                    0x03000034
-# define TLS1_CK_RSA_WITH_AES_256_SHA                    0x03000035
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA                 0x03000036
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA                 0x03000037
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA                0x03000038
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA                0x03000039
-# define TLS1_CK_ADH_WITH_AES_256_SHA                    0x0300003A
+#define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F
+#define TLS1_CK_DH_DSS_WITH_AES_128_SHA 0x03000030
+#define TLS1_CK_DH_RSA_WITH_AES_128_SHA 0x03000031
+#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA 0x03000032
+#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA 0x03000033
+#define TLS1_CK_ADH_WITH_AES_128_SHA 0x03000034
+#define TLS1_CK_RSA_WITH_AES_256_SHA 0x03000035
+#define TLS1_CK_DH_DSS_WITH_AES_256_SHA 0x03000036
+#define TLS1_CK_DH_RSA_WITH_AES_256_SHA 0x03000037
+#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA 0x03000038
+#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA 0x03000039
+#define TLS1_CK_ADH_WITH_AES_256_SHA 0x0300003A
 
 /* TLS v1.2 ciphersuites */
-# define TLS1_CK_RSA_WITH_NULL_SHA256                    0x0300003B
-# define TLS1_CK_RSA_WITH_AES_128_SHA256                 0x0300003C
-# define TLS1_CK_RSA_WITH_AES_256_SHA256                 0x0300003D
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA256              0x0300003E
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA256              0x0300003F
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256             0x03000040
+#define TLS1_CK_RSA_WITH_NULL_SHA256 0x0300003B
+#define TLS1_CK_RSA_WITH_AES_128_SHA256 0x0300003C
+#define TLS1_CK_RSA_WITH_AES_256_SHA256 0x0300003D
+#define TLS1_CK_DH_DSS_WITH_AES_128_SHA256 0x0300003E
+#define TLS1_CK_DH_RSA_WITH_AES_128_SHA256 0x0300003F
+#define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256 0x03000040
 
 /* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA           0x03000041
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA        0x03000042
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA        0x03000043
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA       0x03000044
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA       0x03000045
-# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA           0x03000046
+#define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000041
+#define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000042
+#define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000043
+#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA 0x03000044
+#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA 0x03000045
+#define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA 0x03000046
 
 /* TLS v1.2 ciphersuites */
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256             0x03000067
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA256              0x03000068
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA256              0x03000069
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256             0x0300006A
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256             0x0300006B
-# define TLS1_CK_ADH_WITH_AES_128_SHA256                 0x0300006C
-# define TLS1_CK_ADH_WITH_AES_256_SHA256                 0x0300006D
+#define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256 0x03000067
+#define TLS1_CK_DH_DSS_WITH_AES_256_SHA256 0x03000068
+#define TLS1_CK_DH_RSA_WITH_AES_256_SHA256 0x03000069
+#define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256 0x0300006A
+#define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256 0x0300006B
+#define TLS1_CK_ADH_WITH_AES_128_SHA256 0x0300006C
+#define TLS1_CK_ADH_WITH_AES_256_SHA256 0x0300006D
 
 /* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA           0x03000084
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA        0x03000085
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA        0x03000086
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA       0x03000087
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA       0x03000088
-# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA           0x03000089
+#define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000084
+#define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000085
+#define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000086
+#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA 0x03000087
+#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA 0x03000088
+#define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA 0x03000089
 
 /* SEED ciphersuites from RFC4162 */
-# define TLS1_CK_RSA_WITH_SEED_SHA                       0x03000096
-# define TLS1_CK_DH_DSS_WITH_SEED_SHA                    0x03000097
-# define TLS1_CK_DH_RSA_WITH_SEED_SHA                    0x03000098
-# define TLS1_CK_DHE_DSS_WITH_SEED_SHA                   0x03000099
-# define TLS1_CK_DHE_RSA_WITH_SEED_SHA                   0x0300009A
-# define TLS1_CK_ADH_WITH_SEED_SHA                       0x0300009B
+#define TLS1_CK_RSA_WITH_SEED_SHA 0x03000096
+#define TLS1_CK_DH_DSS_WITH_SEED_SHA 0x03000097
+#define TLS1_CK_DH_RSA_WITH_SEED_SHA 0x03000098
+#define TLS1_CK_DHE_DSS_WITH_SEED_SHA 0x03000099
+#define TLS1_CK_DHE_RSA_WITH_SEED_SHA 0x0300009A
+#define TLS1_CK_ADH_WITH_SEED_SHA 0x0300009B
 
 /* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256             0x0300009C
-# define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384             0x0300009D
-# define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256         0x0300009E
-# define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384         0x0300009F
-# define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256          0x030000A0
-# define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384          0x030000A1
-# define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256         0x030000A2
-# define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384         0x030000A3
-# define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256          0x030000A4
-# define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384          0x030000A5
-# define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256             0x030000A6
-# define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384             0x030000A7
+#define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256 0x0300009C
+#define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384 0x0300009D
+#define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256 0x0300009E
+#define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384 0x0300009F
+#define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256 0x030000A0
+#define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384 0x030000A1
+#define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256 0x030000A2
+#define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384 0x030000A3
+#define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256 0x030000A4
+#define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384 0x030000A5
+#define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256 0x030000A6
+#define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384 0x030000A7
 
 /* CCM ciphersuites from RFC6655 */
-# define TLS1_CK_RSA_WITH_AES_128_CCM                    0x0300C09C
-# define TLS1_CK_RSA_WITH_AES_256_CCM                    0x0300C09D
-# define TLS1_CK_DHE_RSA_WITH_AES_128_CCM                0x0300C09E
-# define TLS1_CK_DHE_RSA_WITH_AES_256_CCM                0x0300C09F
-# define TLS1_CK_RSA_WITH_AES_128_CCM_8                  0x0300C0A0
-# define TLS1_CK_RSA_WITH_AES_256_CCM_8                  0x0300C0A1
-# define TLS1_CK_DHE_RSA_WITH_AES_128_CCM_8              0x0300C0A2
-# define TLS1_CK_DHE_RSA_WITH_AES_256_CCM_8              0x0300C0A3
-# define TLS1_CK_PSK_WITH_AES_128_CCM                    0x0300C0A4
-# define TLS1_CK_PSK_WITH_AES_256_CCM                    0x0300C0A5
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CCM                0x0300C0A6
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CCM                0x0300C0A7
-# define TLS1_CK_PSK_WITH_AES_128_CCM_8                  0x0300C0A8
-# define TLS1_CK_PSK_WITH_AES_256_CCM_8                  0x0300C0A9
-# define TLS1_CK_DHE_PSK_WITH_AES_128_CCM_8              0x0300C0AA
-# define TLS1_CK_DHE_PSK_WITH_AES_256_CCM_8              0x0300C0AB
+#define TLS1_CK_RSA_WITH_AES_128_CCM 0x0300C09C
+#define TLS1_CK_RSA_WITH_AES_256_CCM 0x0300C09D
+#define TLS1_CK_DHE_RSA_WITH_AES_128_CCM 0x0300C09E
+#define TLS1_CK_DHE_RSA_WITH_AES_256_CCM 0x0300C09F
+#define TLS1_CK_RSA_WITH_AES_128_CCM_8 0x0300C0A0
+#define TLS1_CK_RSA_WITH_AES_256_CCM_8 0x0300C0A1
+#define TLS1_CK_DHE_RSA_WITH_AES_128_CCM_8 0x0300C0A2
+#define TLS1_CK_DHE_RSA_WITH_AES_256_CCM_8 0x0300C0A3
+#define TLS1_CK_PSK_WITH_AES_128_CCM 0x0300C0A4
+#define TLS1_CK_PSK_WITH_AES_256_CCM 0x0300C0A5
+#define TLS1_CK_DHE_PSK_WITH_AES_128_CCM 0x0300C0A6
+#define TLS1_CK_DHE_PSK_WITH_AES_256_CCM 0x0300C0A7
+#define TLS1_CK_PSK_WITH_AES_128_CCM_8 0x0300C0A8
+#define TLS1_CK_PSK_WITH_AES_256_CCM_8 0x0300C0A9
+#define TLS1_CK_DHE_PSK_WITH_AES_128_CCM_8 0x0300C0AA
+#define TLS1_CK_DHE_PSK_WITH_AES_256_CCM_8 0x0300C0AB
 
 /* CCM ciphersuites from RFC7251 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM            0x0300C0AC
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM            0x0300C0AD
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM_8          0x0300C0AE
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM_8          0x0300C0AF
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM 0x0300C0AC
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM 0x0300C0AD
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CCM_8 0x0300C0AE
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CCM_8 0x0300C0AF
 
 /* TLS 1.2 Camellia SHA-256 ciphersuites from RFC5932 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA256                0x030000BA
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256             0x030000BB
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256             0x030000BC
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256            0x030000BD
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256            0x030000BE
-# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA256                0x030000BF
+#define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA256 0x030000BA
+#define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256 0x030000BB
+#define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256 0x030000BC
+#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 0x030000BD
+#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 0x030000BE
+#define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA256 0x030000BF
 
-# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA256                0x030000C0
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256             0x030000C1
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256             0x030000C2
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256            0x030000C3
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256            0x030000C4
-# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256                0x030000C5
+#define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA256 0x030000C0
+#define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256 0x030000C1
+#define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256 0x030000C2
+#define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 0x030000C3
+#define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 0x030000C4
+#define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA256 0x030000C5
 
 /* ECC ciphersuites from RFC4492 */
-# define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001
-# define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002
-# define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA        0x0300C003
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA         0x0300C004
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA         0x0300C005
+#define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA 0x0300C001
+#define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA 0x0300C002
+#define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA 0x0300C003
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA 0x0300C004
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA 0x0300C005
 
-# define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA               0x0300C006
-# define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA            0x0300C007
-# define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA       0x0300C008
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA        0x0300C009
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA        0x0300C00A
+#define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA 0x0300C006
+#define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA 0x0300C007
+#define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA 0x0300C008
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA 0x0300C009
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA 0x0300C00A
 
-# define TLS1_CK_ECDH_RSA_WITH_NULL_SHA                  0x0300C00B
-# define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA               0x0300C00C
-# define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA          0x0300C00D
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA           0x0300C00E
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA           0x0300C00F
+#define TLS1_CK_ECDH_RSA_WITH_NULL_SHA 0x0300C00B
+#define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA 0x0300C00C
+#define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA 0x0300C00D
+#define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA 0x0300C00E
+#define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA 0x0300C00F
 
-# define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA                 0x0300C010
-# define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA              0x0300C011
-# define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA         0x0300C012
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA          0x0300C013
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA          0x0300C014
+#define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA 0x0300C010
+#define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA 0x0300C011
+#define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA 0x0300C012
+#define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA 0x0300C013
+#define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA 0x0300C014
 
-# define TLS1_CK_ECDH_anon_WITH_NULL_SHA                 0x0300C015
-# define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA              0x0300C016
-# define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA         0x0300C017
-# define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA          0x0300C018
-# define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA          0x0300C019
+#define TLS1_CK_ECDH_anon_WITH_NULL_SHA 0x0300C015
+#define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA 0x0300C016
+#define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA 0x0300C017
+#define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA 0x0300C018
+#define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA 0x0300C019
 
 /* SRP ciphersuites from RFC 5054 */
-# define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA           0x0300C01A
-# define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA       0x0300C01B
-# define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA       0x0300C01C
-# define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA            0x0300C01D
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA        0x0300C01E
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA        0x0300C01F
-# define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA            0x0300C020
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA        0x0300C021
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA        0x0300C022
+#define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA 0x0300C01A
+#define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA 0x0300C01B
+#define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA 0x0300C01C
+#define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA 0x0300C01D
+#define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA 0x0300C01E
+#define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA 0x0300C01F
+#define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA 0x0300C020
+#define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA 0x0300C021
+#define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA 0x0300C022
 
 /* ECDH HMAC based ciphersuites from RFC5289 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256         0x0300C023
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384         0x0300C024
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256          0x0300C025
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384          0x0300C026
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256           0x0300C027
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384           0x0300C028
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256            0x0300C029
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384            0x0300C02A
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256 0x0300C023
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384 0x0300C024
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256 0x0300C025
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384 0x0300C026
+#define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256 0x0300C027
+#define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384 0x0300C028
+#define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256 0x0300C029
+#define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384 0x0300C02A
 
 /* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256     0x0300C02B
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384     0x0300C02C
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256      0x0300C02D
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384      0x0300C02E
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256       0x0300C02F
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384       0x0300C030
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256        0x0300C031
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384        0x0300C032
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 0x0300C02B
+#define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 0x0300C02C
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 0x0300C02D
+#define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 0x0300C02E
+#define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256 0x0300C02F
+#define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384 0x0300C030
+#define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256 0x0300C031
+#define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384 0x0300C032
 
 /* ECDHE PSK ciphersuites from RFC5489 */
-# define TLS1_CK_ECDHE_PSK_WITH_RC4_128_SHA              0x0300C033
-# define TLS1_CK_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA         0x0300C034
-# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA          0x0300C035
-# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA          0x0300C036
+#define TLS1_CK_ECDHE_PSK_WITH_RC4_128_SHA 0x0300C033
+#define TLS1_CK_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA 0x0300C034
+#define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA 0x0300C035
+#define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA 0x0300C036
 
-# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256       0x0300C037
-# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384       0x0300C038
+#define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256 0x0300C037
+#define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384 0x0300C038
 
 /* NULL PSK ciphersuites from RFC4785 */
-# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA                 0x0300C039
-# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256              0x0300C03A
-# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384              0x0300C03B
+#define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA 0x0300C039
+#define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256 0x0300C03A
+#define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384 0x0300C03B
 
 /* Camellia-CBC ciphersuites from RFC6367 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C072
-# define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C073
-# define TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256  0x0300C074
-# define TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384  0x0300C075
-# define TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256   0x0300C076
-# define TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384   0x0300C077
-# define TLS1_CK_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256    0x0300C078
-# define TLS1_CK_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384    0x0300C079
+#define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C072
+#define TLS1_CK_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C073
+#define TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C074
+#define TLS1_CK_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C075
+#define TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C076
+#define TLS1_CK_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C077
+#define TLS1_CK_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256 0x0300C078
+#define TLS1_CK_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384 0x0300C079
 
-# define TLS1_CK_PSK_WITH_CAMELLIA_128_CBC_SHA256         0x0300C094
-# define TLS1_CK_PSK_WITH_CAMELLIA_256_CBC_SHA384         0x0300C095
-# define TLS1_CK_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256     0x0300C096
-# define TLS1_CK_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384     0x0300C097
-# define TLS1_CK_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256     0x0300C098
-# define TLS1_CK_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384     0x0300C099
-# define TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256   0x0300C09A
-# define TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384   0x0300C09B
+#define TLS1_CK_PSK_WITH_CAMELLIA_128_CBC_SHA256 0x0300C094
+#define TLS1_CK_PSK_WITH_CAMELLIA_256_CBC_SHA384 0x0300C095
+#define TLS1_CK_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 0x0300C096
+#define TLS1_CK_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 0x0300C097
+#define TLS1_CK_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 0x0300C098
+#define TLS1_CK_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 0x0300C099
+#define TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 0x0300C09A
+#define TLS1_CK_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 0x0300C09B
 
 /* draft-ietf-tls-chacha20-poly1305-03 */
-# define TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305         0x0300CCA8
-# define TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305       0x0300CCA9
-# define TLS1_CK_DHE_RSA_WITH_CHACHA20_POLY1305           0x0300CCAA
-# define TLS1_CK_PSK_WITH_CHACHA20_POLY1305               0x0300CCAB
-# define TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305         0x0300CCAC
-# define TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305           0x0300CCAD
-# define TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305           0x0300CCAE
+#define TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305 0x0300CCA8
+#define TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 0x0300CCA9
+#define TLS1_CK_DHE_RSA_WITH_CHACHA20_POLY1305 0x0300CCAA
+#define TLS1_CK_PSK_WITH_CHACHA20_POLY1305 0x0300CCAB
+#define TLS1_CK_ECDHE_PSK_WITH_CHACHA20_POLY1305 0x0300CCAC
+#define TLS1_CK_DHE_PSK_WITH_CHACHA20_POLY1305 0x0300CCAD
+#define TLS1_CK_RSA_PSK_WITH_CHACHA20_POLY1305 0x0300CCAE
 
 /* TLS v1.3 ciphersuites */
-# define TLS1_3_CK_AES_128_GCM_SHA256                     0x03001301
-# define TLS1_3_CK_AES_256_GCM_SHA384                     0x03001302
-# define TLS1_3_CK_CHACHA20_POLY1305_SHA256               0x03001303
-# define TLS1_3_CK_AES_128_CCM_SHA256                     0x03001304
-# define TLS1_3_CK_AES_128_CCM_8_SHA256                   0x03001305
+#define TLS1_3_CK_AES_128_GCM_SHA256 0x03001301
+#define TLS1_3_CK_AES_256_GCM_SHA384 0x03001302
+#define TLS1_3_CK_CHACHA20_POLY1305_SHA256 0x03001303
+#define TLS1_3_CK_AES_128_CCM_SHA256 0x03001304
+#define TLS1_3_CK_AES_128_CCM_8_SHA256 0x03001305
 
 /* Integrity-only ciphersuites from RFC 9150 */
-# define TLS1_3_CK_SHA256_SHA256                          0x0300C0B4
-# define TLS1_3_CK_SHA384_SHA384                          0x0300C0B5
+#define TLS1_3_CK_SHA256_SHA256 0x0300C0B4
+#define TLS1_3_CK_SHA384_SHA384 0x0300C0B5
 
 /* Aria ciphersuites from RFC6209 */
-# define TLS1_CK_RSA_WITH_ARIA_128_GCM_SHA256             0x0300C050
-# define TLS1_CK_RSA_WITH_ARIA_256_GCM_SHA384             0x0300C051
-# define TLS1_CK_DHE_RSA_WITH_ARIA_128_GCM_SHA256         0x0300C052
-# define TLS1_CK_DHE_RSA_WITH_ARIA_256_GCM_SHA384         0x0300C053
-# define TLS1_CK_DH_RSA_WITH_ARIA_128_GCM_SHA256          0x0300C054
-# define TLS1_CK_DH_RSA_WITH_ARIA_256_GCM_SHA384          0x0300C055
-# define TLS1_CK_DHE_DSS_WITH_ARIA_128_GCM_SHA256         0x0300C056
-# define TLS1_CK_DHE_DSS_WITH_ARIA_256_GCM_SHA384         0x0300C057
-# define TLS1_CK_DH_DSS_WITH_ARIA_128_GCM_SHA256          0x0300C058
-# define TLS1_CK_DH_DSS_WITH_ARIA_256_GCM_SHA384          0x0300C059
-# define TLS1_CK_DH_anon_WITH_ARIA_128_GCM_SHA256         0x0300C05A
-# define TLS1_CK_DH_anon_WITH_ARIA_256_GCM_SHA384         0x0300C05B
-# define TLS1_CK_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256     0x0300C05C
-# define TLS1_CK_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384     0x0300C05D
-# define TLS1_CK_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256      0x0300C05E
-# define TLS1_CK_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384      0x0300C05F
-# define TLS1_CK_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256       0x0300C060
-# define TLS1_CK_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384       0x0300C061
-# define TLS1_CK_ECDH_RSA_WITH_ARIA_128_GCM_SHA256        0x0300C062
-# define TLS1_CK_ECDH_RSA_WITH_ARIA_256_GCM_SHA384        0x0300C063
-# define TLS1_CK_PSK_WITH_ARIA_128_GCM_SHA256             0x0300C06A
-# define TLS1_CK_PSK_WITH_ARIA_256_GCM_SHA384             0x0300C06B
-# define TLS1_CK_DHE_PSK_WITH_ARIA_128_GCM_SHA256         0x0300C06C
-# define TLS1_CK_DHE_PSK_WITH_ARIA_256_GCM_SHA384         0x0300C06D
-# define TLS1_CK_RSA_PSK_WITH_ARIA_128_GCM_SHA256         0x0300C06E
-# define TLS1_CK_RSA_PSK_WITH_ARIA_256_GCM_SHA384         0x0300C06F
+#define TLS1_CK_RSA_WITH_ARIA_128_GCM_SHA256 0x0300C050
+#define TLS1_CK_RSA_WITH_ARIA_256_GCM_SHA384 0x0300C051
+#define TLS1_CK_DHE_RSA_WITH_ARIA_128_GCM_SHA256 0x0300C052
+#define TLS1_CK_DHE_RSA_WITH_ARIA_256_GCM_SHA384 0x0300C053
+#define TLS1_CK_DH_RSA_WITH_ARIA_128_GCM_SHA256 0x0300C054
+#define TLS1_CK_DH_RSA_WITH_ARIA_256_GCM_SHA384 0x0300C055
+#define TLS1_CK_DHE_DSS_WITH_ARIA_128_GCM_SHA256 0x0300C056
+#define TLS1_CK_DHE_DSS_WITH_ARIA_256_GCM_SHA384 0x0300C057
+#define TLS1_CK_DH_DSS_WITH_ARIA_128_GCM_SHA256 0x0300C058
+#define TLS1_CK_DH_DSS_WITH_ARIA_256_GCM_SHA384 0x0300C059
+#define TLS1_CK_DH_anon_WITH_ARIA_128_GCM_SHA256 0x0300C05A
+#define TLS1_CK_DH_anon_WITH_ARIA_256_GCM_SHA384 0x0300C05B
+#define TLS1_CK_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256 0x0300C05C
+#define TLS1_CK_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384 0x0300C05D
+#define TLS1_CK_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256 0x0300C05E
+#define TLS1_CK_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384 0x0300C05F
+#define TLS1_CK_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256 0x0300C060
+#define TLS1_CK_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384 0x0300C061
+#define TLS1_CK_ECDH_RSA_WITH_ARIA_128_GCM_SHA256 0x0300C062
+#define TLS1_CK_ECDH_RSA_WITH_ARIA_256_GCM_SHA384 0x0300C063
+#define TLS1_CK_PSK_WITH_ARIA_128_GCM_SHA256 0x0300C06A
+#define TLS1_CK_PSK_WITH_ARIA_256_GCM_SHA384 0x0300C06B
+#define TLS1_CK_DHE_PSK_WITH_ARIA_128_GCM_SHA256 0x0300C06C
+#define TLS1_CK_DHE_PSK_WITH_ARIA_256_GCM_SHA384 0x0300C06D
+#define TLS1_CK_RSA_PSK_WITH_ARIA_128_GCM_SHA256 0x0300C06E
+#define TLS1_CK_RSA_PSK_WITH_ARIA_256_GCM_SHA384 0x0300C06F
 
 /* a bundle of RFC standard cipher names, generated from ssl3_ciphers[] */
-# define TLS1_RFC_RSA_WITH_AES_128_SHA                   "TLS_RSA_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_DHE_DSS_WITH_AES_128_SHA               "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_DHE_RSA_WITH_AES_128_SHA               "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_ADH_WITH_AES_128_SHA                   "TLS_DH_anon_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_RSA_WITH_AES_256_SHA                   "TLS_RSA_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_DHE_DSS_WITH_AES_256_SHA               "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_DHE_RSA_WITH_AES_256_SHA               "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_ADH_WITH_AES_256_SHA                   "TLS_DH_anon_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_RSA_WITH_NULL_SHA256                   "TLS_RSA_WITH_NULL_SHA256"
-# define TLS1_RFC_RSA_WITH_AES_128_SHA256                "TLS_RSA_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_RSA_WITH_AES_256_SHA256                "TLS_RSA_WITH_AES_256_CBC_SHA256"
-# define TLS1_RFC_DHE_DSS_WITH_AES_128_SHA256            "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_DHE_RSA_WITH_AES_128_SHA256            "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_DHE_DSS_WITH_AES_256_SHA256            "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
-# define TLS1_RFC_DHE_RSA_WITH_AES_256_SHA256            "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
-# define TLS1_RFC_ADH_WITH_AES_128_SHA256                "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_ADH_WITH_AES_256_SHA256                "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
-# define TLS1_RFC_RSA_WITH_AES_128_GCM_SHA256            "TLS_RSA_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_RSA_WITH_AES_256_GCM_SHA384            "TLS_RSA_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_DHE_RSA_WITH_AES_128_GCM_SHA256        "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_DHE_RSA_WITH_AES_256_GCM_SHA384        "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_DHE_DSS_WITH_AES_128_GCM_SHA256        "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_DHE_DSS_WITH_AES_256_GCM_SHA384        "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_ADH_WITH_AES_128_GCM_SHA256            "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_ADH_WITH_AES_256_GCM_SHA384            "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_RSA_WITH_AES_128_CCM                   "TLS_RSA_WITH_AES_128_CCM"
-# define TLS1_RFC_RSA_WITH_AES_256_CCM                   "TLS_RSA_WITH_AES_256_CCM"
-# define TLS1_RFC_DHE_RSA_WITH_AES_128_CCM               "TLS_DHE_RSA_WITH_AES_128_CCM"
-# define TLS1_RFC_DHE_RSA_WITH_AES_256_CCM               "TLS_DHE_RSA_WITH_AES_256_CCM"
-# define TLS1_RFC_RSA_WITH_AES_128_CCM_8                 "TLS_RSA_WITH_AES_128_CCM_8"
-# define TLS1_RFC_RSA_WITH_AES_256_CCM_8                 "TLS_RSA_WITH_AES_256_CCM_8"
-# define TLS1_RFC_DHE_RSA_WITH_AES_128_CCM_8             "TLS_DHE_RSA_WITH_AES_128_CCM_8"
-# define TLS1_RFC_DHE_RSA_WITH_AES_256_CCM_8             "TLS_DHE_RSA_WITH_AES_256_CCM_8"
-# define TLS1_RFC_PSK_WITH_AES_128_CCM                   "TLS_PSK_WITH_AES_128_CCM"
-# define TLS1_RFC_PSK_WITH_AES_256_CCM                   "TLS_PSK_WITH_AES_256_CCM"
-# define TLS1_RFC_DHE_PSK_WITH_AES_128_CCM               "TLS_DHE_PSK_WITH_AES_128_CCM"
-# define TLS1_RFC_DHE_PSK_WITH_AES_256_CCM               "TLS_DHE_PSK_WITH_AES_256_CCM"
-# define TLS1_RFC_PSK_WITH_AES_128_CCM_8                 "TLS_PSK_WITH_AES_128_CCM_8"
-# define TLS1_RFC_PSK_WITH_AES_256_CCM_8                 "TLS_PSK_WITH_AES_256_CCM_8"
-# define TLS1_RFC_DHE_PSK_WITH_AES_128_CCM_8             "TLS_PSK_DHE_WITH_AES_128_CCM_8"
-# define TLS1_RFC_DHE_PSK_WITH_AES_256_CCM_8             "TLS_PSK_DHE_WITH_AES_256_CCM_8"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM           "TLS_ECDHE_ECDSA_WITH_AES_128_CCM"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM           "TLS_ECDHE_ECDSA_WITH_AES_256_CCM"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM_8         "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM_8         "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"
-# define TLS1_3_RFC_AES_128_GCM_SHA256                   "TLS_AES_128_GCM_SHA256"
-# define TLS1_3_RFC_AES_256_GCM_SHA384                   "TLS_AES_256_GCM_SHA384"
-# define TLS1_3_RFC_CHACHA20_POLY1305_SHA256             "TLS_CHACHA20_POLY1305_SHA256"
-# define TLS1_3_RFC_SHA256_SHA256                        "TLS_SHA256_SHA256"
-# define TLS1_3_RFC_SHA384_SHA384                        "TLS_SHA384_SHA384"
-# define TLS1_3_RFC_AES_128_CCM_SHA256                   "TLS_AES_128_CCM_SHA256"
-# define TLS1_3_RFC_AES_128_CCM_8_SHA256                 "TLS_AES_128_CCM_8_SHA256"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_NULL_SHA              "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA      "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CBC_SHA       "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CBC_SHA       "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_ECDHE_RSA_WITH_NULL_SHA                "TLS_ECDHE_RSA_WITH_NULL_SHA"
-# define TLS1_RFC_ECDHE_RSA_WITH_DES_192_CBC3_SHA        "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_ECDHE_RSA_WITH_AES_128_CBC_SHA         "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_ECDHE_RSA_WITH_AES_256_CBC_SHA         "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_ECDH_anon_WITH_NULL_SHA                "TLS_ECDH_anon_WITH_NULL_SHA"
-# define TLS1_RFC_ECDH_anon_WITH_DES_192_CBC3_SHA        "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_ECDH_anon_WITH_AES_128_CBC_SHA         "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_ECDH_anon_WITH_AES_256_CBC_SHA         "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_SHA256        "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_SHA384        "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
-# define TLS1_RFC_ECDHE_RSA_WITH_AES_128_SHA256          "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_ECDHE_RSA_WITH_AES_256_SHA384          "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256    "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384    "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_ECDHE_RSA_WITH_AES_128_GCM_SHA256      "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_ECDHE_RSA_WITH_AES_256_GCM_SHA384      "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_PSK_WITH_NULL_SHA                      "TLS_PSK_WITH_NULL_SHA"
-# define TLS1_RFC_DHE_PSK_WITH_NULL_SHA                  "TLS_DHE_PSK_WITH_NULL_SHA"
-# define TLS1_RFC_RSA_PSK_WITH_NULL_SHA                  "TLS_RSA_PSK_WITH_NULL_SHA"
-# define TLS1_RFC_PSK_WITH_3DES_EDE_CBC_SHA              "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_PSK_WITH_AES_128_CBC_SHA               "TLS_PSK_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_PSK_WITH_AES_256_CBC_SHA               "TLS_PSK_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_DHE_PSK_WITH_3DES_EDE_CBC_SHA          "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA           "TLS_DHE_PSK_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA           "TLS_DHE_PSK_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_RSA_PSK_WITH_3DES_EDE_CBC_SHA          "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA           "TLS_RSA_PSK_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA           "TLS_RSA_PSK_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_PSK_WITH_AES_128_GCM_SHA256            "TLS_PSK_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_PSK_WITH_AES_256_GCM_SHA384            "TLS_PSK_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_DHE_PSK_WITH_AES_128_GCM_SHA256        "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_DHE_PSK_WITH_AES_256_GCM_SHA384        "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_RSA_PSK_WITH_AES_128_GCM_SHA256        "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256"
-# define TLS1_RFC_RSA_PSK_WITH_AES_256_GCM_SHA384        "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384"
-# define TLS1_RFC_PSK_WITH_AES_128_CBC_SHA256            "TLS_PSK_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_PSK_WITH_AES_256_CBC_SHA384            "TLS_PSK_WITH_AES_256_CBC_SHA384"
-# define TLS1_RFC_PSK_WITH_NULL_SHA256                   "TLS_PSK_WITH_NULL_SHA256"
-# define TLS1_RFC_PSK_WITH_NULL_SHA384                   "TLS_PSK_WITH_NULL_SHA384"
-# define TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA256        "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA384        "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384"
-# define TLS1_RFC_DHE_PSK_WITH_NULL_SHA256               "TLS_DHE_PSK_WITH_NULL_SHA256"
-# define TLS1_RFC_DHE_PSK_WITH_NULL_SHA384               "TLS_DHE_PSK_WITH_NULL_SHA384"
-# define TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA256        "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA384        "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384"
-# define TLS1_RFC_RSA_PSK_WITH_NULL_SHA256               "TLS_RSA_PSK_WITH_NULL_SHA256"
-# define TLS1_RFC_RSA_PSK_WITH_NULL_SHA384               "TLS_RSA_PSK_WITH_NULL_SHA384"
-# define TLS1_RFC_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA        "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA         "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA         "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA256      "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256"
-# define TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA384      "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384"
-# define TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA                "TLS_ECDHE_PSK_WITH_NULL_SHA"
-# define TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA256             "TLS_ECDHE_PSK_WITH_NULL_SHA256"
-# define TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA384             "TLS_ECDHE_PSK_WITH_NULL_SHA384"
-# define TLS1_RFC_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA      "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_WITH_AES_128_CBC_SHA           "TLS_SRP_SHA_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_RSA_WITH_AES_128_CBC_SHA       "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_DSS_WITH_AES_128_CBC_SHA       "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_WITH_AES_256_CBC_SHA           "TLS_SRP_SHA_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_RSA_WITH_AES_256_CBC_SHA       "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_SRP_SHA_DSS_WITH_AES_256_CBC_SHA       "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA"
-# define TLS1_RFC_DHE_RSA_WITH_CHACHA20_POLY1305         "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_ECDHE_RSA_WITH_CHACHA20_POLY1305       "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_CHACHA20_POLY1305     "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_PSK_WITH_CHACHA20_POLY1305             "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_ECDHE_PSK_WITH_CHACHA20_POLY1305       "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_DHE_PSK_WITH_CHACHA20_POLY1305         "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_RSA_PSK_WITH_CHACHA20_POLY1305         "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"
-# define TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA256       "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256   "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256   "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA256       "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA256       "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256"
-# define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256   "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256"
-# define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256   "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"
-# define TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA256       "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"
-# define TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA          "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
-# define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA      "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
-# define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA      "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
-# define TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA          "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA"
-# define TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA          "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
-# define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA      "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
-# define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA      "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
-# define TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA          "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"
-# define TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384"
-# define TLS1_RFC_PSK_WITH_CAMELLIA_128_CBC_SHA256       "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_PSK_WITH_CAMELLIA_256_CBC_SHA384       "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384"
-# define TLS1_RFC_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256   "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384   "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"
-# define TLS1_RFC_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256   "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384   "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384"
-# define TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"
-# define TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"
-# define TLS1_RFC_RSA_WITH_SEED_SHA                      "TLS_RSA_WITH_SEED_CBC_SHA"
-# define TLS1_RFC_DHE_DSS_WITH_SEED_SHA                  "TLS_DHE_DSS_WITH_SEED_CBC_SHA"
-# define TLS1_RFC_DHE_RSA_WITH_SEED_SHA                  "TLS_DHE_RSA_WITH_SEED_CBC_SHA"
-# define TLS1_RFC_ADH_WITH_SEED_SHA                      "TLS_DH_anon_WITH_SEED_CBC_SHA"
-# define TLS1_RFC_ECDHE_PSK_WITH_RC4_128_SHA             "TLS_ECDHE_PSK_WITH_RC4_128_SHA"
-# define TLS1_RFC_ECDH_anon_WITH_RC4_128_SHA             "TLS_ECDH_anon_WITH_RC4_128_SHA"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_RC4_128_SHA           "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
-# define TLS1_RFC_ECDHE_RSA_WITH_RC4_128_SHA             "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
-# define TLS1_RFC_PSK_WITH_RC4_128_SHA                   "TLS_PSK_WITH_RC4_128_SHA"
-# define TLS1_RFC_RSA_PSK_WITH_RC4_128_SHA               "TLS_RSA_PSK_WITH_RC4_128_SHA"
-# define TLS1_RFC_DHE_PSK_WITH_RC4_128_SHA               "TLS_DHE_PSK_WITH_RC4_128_SHA"
-# define TLS1_RFC_RSA_WITH_ARIA_128_GCM_SHA256           "TLS_RSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_RSA_WITH_ARIA_256_GCM_SHA384           "TLS_RSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_DHE_RSA_WITH_ARIA_128_GCM_SHA256       "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_DHE_RSA_WITH_ARIA_256_GCM_SHA384       "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_DH_RSA_WITH_ARIA_128_GCM_SHA256        "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_DH_RSA_WITH_ARIA_256_GCM_SHA384        "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_DHE_DSS_WITH_ARIA_128_GCM_SHA256       "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_DHE_DSS_WITH_ARIA_256_GCM_SHA384       "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_DH_DSS_WITH_ARIA_128_GCM_SHA256        "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_DH_DSS_WITH_ARIA_256_GCM_SHA384        "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_DH_anon_WITH_ARIA_128_GCM_SHA256       "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_DH_anon_WITH_ARIA_256_GCM_SHA384       "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256   "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384   "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256    "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384    "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256     "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384     "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_ECDH_RSA_WITH_ARIA_128_GCM_SHA256      "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_ECDH_RSA_WITH_ARIA_256_GCM_SHA384      "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_PSK_WITH_ARIA_128_GCM_SHA256           "TLS_PSK_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_PSK_WITH_ARIA_256_GCM_SHA384           "TLS_PSK_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_DHE_PSK_WITH_ARIA_128_GCM_SHA256       "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_DHE_PSK_WITH_ARIA_256_GCM_SHA384       "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384"
-# define TLS1_RFC_RSA_PSK_WITH_ARIA_128_GCM_SHA256       "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256"
-# define TLS1_RFC_RSA_PSK_WITH_ARIA_256_GCM_SHA384       "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384"
-
+#define TLS1_RFC_RSA_WITH_AES_128_SHA "TLS_RSA_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_DHE_DSS_WITH_AES_128_SHA "TLS_DHE_DSS_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_DHE_RSA_WITH_AES_128_SHA "TLS_DHE_RSA_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_ADH_WITH_AES_128_SHA "TLS_DH_anon_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_RSA_WITH_AES_256_SHA "TLS_RSA_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_DHE_DSS_WITH_AES_256_SHA "TLS_DHE_DSS_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_DHE_RSA_WITH_AES_256_SHA "TLS_DHE_RSA_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_ADH_WITH_AES_256_SHA "TLS_DH_anon_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_RSA_WITH_NULL_SHA256 "TLS_RSA_WITH_NULL_SHA256"
+#define TLS1_RFC_RSA_WITH_AES_128_SHA256 "TLS_RSA_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_RSA_WITH_AES_256_SHA256 "TLS_RSA_WITH_AES_256_CBC_SHA256"
+#define TLS1_RFC_DHE_DSS_WITH_AES_128_SHA256 "TLS_DHE_DSS_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_DHE_RSA_WITH_AES_128_SHA256 "TLS_DHE_RSA_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_DHE_DSS_WITH_AES_256_SHA256 "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256"
+#define TLS1_RFC_DHE_RSA_WITH_AES_256_SHA256 "TLS_DHE_RSA_WITH_AES_256_CBC_SHA256"
+#define TLS1_RFC_ADH_WITH_AES_128_SHA256 "TLS_DH_anon_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_ADH_WITH_AES_256_SHA256 "TLS_DH_anon_WITH_AES_256_CBC_SHA256"
+#define TLS1_RFC_RSA_WITH_AES_128_GCM_SHA256 "TLS_RSA_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_RSA_WITH_AES_256_GCM_SHA384 "TLS_RSA_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_DHE_RSA_WITH_AES_128_GCM_SHA256 "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_DHE_RSA_WITH_AES_256_GCM_SHA384 "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_DHE_DSS_WITH_AES_128_GCM_SHA256 "TLS_DHE_DSS_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_DHE_DSS_WITH_AES_256_GCM_SHA384 "TLS_DHE_DSS_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_ADH_WITH_AES_128_GCM_SHA256 "TLS_DH_anon_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_ADH_WITH_AES_256_GCM_SHA384 "TLS_DH_anon_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_RSA_WITH_AES_128_CCM "TLS_RSA_WITH_AES_128_CCM"
+#define TLS1_RFC_RSA_WITH_AES_256_CCM "TLS_RSA_WITH_AES_256_CCM"
+#define TLS1_RFC_DHE_RSA_WITH_AES_128_CCM "TLS_DHE_RSA_WITH_AES_128_CCM"
+#define TLS1_RFC_DHE_RSA_WITH_AES_256_CCM "TLS_DHE_RSA_WITH_AES_256_CCM"
+#define TLS1_RFC_RSA_WITH_AES_128_CCM_8 "TLS_RSA_WITH_AES_128_CCM_8"
+#define TLS1_RFC_RSA_WITH_AES_256_CCM_8 "TLS_RSA_WITH_AES_256_CCM_8"
+#define TLS1_RFC_DHE_RSA_WITH_AES_128_CCM_8 "TLS_DHE_RSA_WITH_AES_128_CCM_8"
+#define TLS1_RFC_DHE_RSA_WITH_AES_256_CCM_8 "TLS_DHE_RSA_WITH_AES_256_CCM_8"
+#define TLS1_RFC_PSK_WITH_AES_128_CCM "TLS_PSK_WITH_AES_128_CCM"
+#define TLS1_RFC_PSK_WITH_AES_256_CCM "TLS_PSK_WITH_AES_256_CCM"
+#define TLS1_RFC_DHE_PSK_WITH_AES_128_CCM "TLS_DHE_PSK_WITH_AES_128_CCM"
+#define TLS1_RFC_DHE_PSK_WITH_AES_256_CCM "TLS_DHE_PSK_WITH_AES_256_CCM"
+#define TLS1_RFC_PSK_WITH_AES_128_CCM_8 "TLS_PSK_WITH_AES_128_CCM_8"
+#define TLS1_RFC_PSK_WITH_AES_256_CCM_8 "TLS_PSK_WITH_AES_256_CCM_8"
+#define TLS1_RFC_DHE_PSK_WITH_AES_128_CCM_8 "TLS_PSK_DHE_WITH_AES_128_CCM_8"
+#define TLS1_RFC_DHE_PSK_WITH_AES_256_CCM_8 "TLS_PSK_DHE_WITH_AES_256_CCM_8"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM "TLS_ECDHE_ECDSA_WITH_AES_128_CCM"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM "TLS_ECDHE_ECDSA_WITH_AES_256_CCM"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CCM_8 "TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CCM_8 "TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"
+#define TLS1_3_RFC_AES_128_GCM_SHA256 "TLS_AES_128_GCM_SHA256"
+#define TLS1_3_RFC_AES_256_GCM_SHA384 "TLS_AES_256_GCM_SHA384"
+#define TLS1_3_RFC_CHACHA20_POLY1305_SHA256 "TLS_CHACHA20_POLY1305_SHA256"
+#define TLS1_3_RFC_SHA256_SHA256 "TLS_SHA256_SHA256"
+#define TLS1_3_RFC_SHA384_SHA384 "TLS_SHA384_SHA384"
+#define TLS1_3_RFC_AES_128_CCM_SHA256 "TLS_AES_128_CCM_SHA256"
+#define TLS1_3_RFC_AES_128_CCM_8_SHA256 "TLS_AES_128_CCM_8_SHA256"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_NULL_SHA "TLS_ECDHE_ECDSA_WITH_NULL_SHA"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA "TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_CBC_SHA "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_CBC_SHA "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_ECDHE_RSA_WITH_NULL_SHA "TLS_ECDHE_RSA_WITH_NULL_SHA"
+#define TLS1_RFC_ECDHE_RSA_WITH_DES_192_CBC3_SHA "TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_ECDHE_RSA_WITH_AES_128_CBC_SHA "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_ECDHE_RSA_WITH_AES_256_CBC_SHA "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_ECDH_anon_WITH_NULL_SHA "TLS_ECDH_anon_WITH_NULL_SHA"
+#define TLS1_RFC_ECDH_anon_WITH_DES_192_CBC3_SHA "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_ECDH_anon_WITH_AES_128_CBC_SHA "TLS_ECDH_anon_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_ECDH_anon_WITH_AES_256_CBC_SHA "TLS_ECDH_anon_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_SHA256 "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_SHA384 "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384"
+#define TLS1_RFC_ECDHE_RSA_WITH_AES_128_SHA256 "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_ECDHE_RSA_WITH_AES_256_SHA384 "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_PSK_WITH_NULL_SHA "TLS_PSK_WITH_NULL_SHA"
+#define TLS1_RFC_DHE_PSK_WITH_NULL_SHA "TLS_DHE_PSK_WITH_NULL_SHA"
+#define TLS1_RFC_RSA_PSK_WITH_NULL_SHA "TLS_RSA_PSK_WITH_NULL_SHA"
+#define TLS1_RFC_PSK_WITH_3DES_EDE_CBC_SHA "TLS_PSK_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_PSK_WITH_AES_128_CBC_SHA "TLS_PSK_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_PSK_WITH_AES_256_CBC_SHA "TLS_PSK_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_DHE_PSK_WITH_3DES_EDE_CBC_SHA "TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA "TLS_DHE_PSK_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA "TLS_DHE_PSK_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_RSA_PSK_WITH_3DES_EDE_CBC_SHA "TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA "TLS_RSA_PSK_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA "TLS_RSA_PSK_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_PSK_WITH_AES_128_GCM_SHA256 "TLS_PSK_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_PSK_WITH_AES_256_GCM_SHA384 "TLS_PSK_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_DHE_PSK_WITH_AES_128_GCM_SHA256 "TLS_DHE_PSK_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_DHE_PSK_WITH_AES_256_GCM_SHA384 "TLS_DHE_PSK_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_RSA_PSK_WITH_AES_128_GCM_SHA256 "TLS_RSA_PSK_WITH_AES_128_GCM_SHA256"
+#define TLS1_RFC_RSA_PSK_WITH_AES_256_GCM_SHA384 "TLS_RSA_PSK_WITH_AES_256_GCM_SHA384"
+#define TLS1_RFC_PSK_WITH_AES_128_CBC_SHA256 "TLS_PSK_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_PSK_WITH_AES_256_CBC_SHA384 "TLS_PSK_WITH_AES_256_CBC_SHA384"
+#define TLS1_RFC_PSK_WITH_NULL_SHA256 "TLS_PSK_WITH_NULL_SHA256"
+#define TLS1_RFC_PSK_WITH_NULL_SHA384 "TLS_PSK_WITH_NULL_SHA384"
+#define TLS1_RFC_DHE_PSK_WITH_AES_128_CBC_SHA256 "TLS_DHE_PSK_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_DHE_PSK_WITH_AES_256_CBC_SHA384 "TLS_DHE_PSK_WITH_AES_256_CBC_SHA384"
+#define TLS1_RFC_DHE_PSK_WITH_NULL_SHA256 "TLS_DHE_PSK_WITH_NULL_SHA256"
+#define TLS1_RFC_DHE_PSK_WITH_NULL_SHA384 "TLS_DHE_PSK_WITH_NULL_SHA384"
+#define TLS1_RFC_RSA_PSK_WITH_AES_128_CBC_SHA256 "TLS_RSA_PSK_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_RSA_PSK_WITH_AES_256_CBC_SHA384 "TLS_RSA_PSK_WITH_AES_256_CBC_SHA384"
+#define TLS1_RFC_RSA_PSK_WITH_NULL_SHA256 "TLS_RSA_PSK_WITH_NULL_SHA256"
+#define TLS1_RFC_RSA_PSK_WITH_NULL_SHA384 "TLS_RSA_PSK_WITH_NULL_SHA384"
+#define TLS1_RFC_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA "TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_ECDHE_PSK_WITH_AES_128_CBC_SHA256 "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256"
+#define TLS1_RFC_ECDHE_PSK_WITH_AES_256_CBC_SHA384 "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384"
+#define TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA "TLS_ECDHE_PSK_WITH_NULL_SHA"
+#define TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA256 "TLS_ECDHE_PSK_WITH_NULL_SHA256"
+#define TLS1_RFC_ECDHE_PSK_WITH_NULL_SHA384 "TLS_ECDHE_PSK_WITH_NULL_SHA384"
+#define TLS1_RFC_SRP_SHA_WITH_3DES_EDE_CBC_SHA "TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA "TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA "TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_WITH_AES_128_CBC_SHA "TLS_SRP_SHA_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_RSA_WITH_AES_128_CBC_SHA "TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_DSS_WITH_AES_128_CBC_SHA "TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_WITH_AES_256_CBC_SHA "TLS_SRP_SHA_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_RSA_WITH_AES_256_CBC_SHA "TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_SRP_SHA_DSS_WITH_AES_256_CBC_SHA "TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA"
+#define TLS1_RFC_DHE_RSA_WITH_CHACHA20_POLY1305 "TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_ECDHE_RSA_WITH_CHACHA20_POLY1305 "TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_PSK_WITH_CHACHA20_POLY1305 "TLS_PSK_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_ECDHE_PSK_WITH_CHACHA20_POLY1305 "TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_DHE_PSK_WITH_CHACHA20_POLY1305 "TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_RSA_PSK_WITH_CHACHA20_POLY1305 "TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"
+#define TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA256 "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA256 "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA256 "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256"
+#define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256"
+#define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"
+#define TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA256 "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"
+#define TLS1_RFC_RSA_WITH_CAMELLIA_256_CBC_SHA "TLS_RSA_WITH_CAMELLIA_256_CBC_SHA"
+#define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA "TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA"
+#define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA "TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA"
+#define TLS1_RFC_ADH_WITH_CAMELLIA_256_CBC_SHA "TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA"
+#define TLS1_RFC_RSA_WITH_CAMELLIA_128_CBC_SHA "TLS_RSA_WITH_CAMELLIA_128_CBC_SHA"
+#define TLS1_RFC_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA "TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA"
+#define TLS1_RFC_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA "TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA"
+#define TLS1_RFC_ADH_WITH_CAMELLIA_128_CBC_SHA "TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384"
+#define TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 "TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 "TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384"
+#define TLS1_RFC_PSK_WITH_CAMELLIA_128_CBC_SHA256 "TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_PSK_WITH_CAMELLIA_256_CBC_SHA384 "TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384"
+#define TLS1_RFC_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 "TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 "TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"
+#define TLS1_RFC_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 "TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 "TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384"
+#define TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 "TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256"
+#define TLS1_RFC_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 "TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384"
+#define TLS1_RFC_RSA_WITH_SEED_SHA "TLS_RSA_WITH_SEED_CBC_SHA"
+#define TLS1_RFC_DHE_DSS_WITH_SEED_SHA "TLS_DHE_DSS_WITH_SEED_CBC_SHA"
+#define TLS1_RFC_DHE_RSA_WITH_SEED_SHA "TLS_DHE_RSA_WITH_SEED_CBC_SHA"
+#define TLS1_RFC_ADH_WITH_SEED_SHA "TLS_DH_anon_WITH_SEED_CBC_SHA"
+#define TLS1_RFC_ECDHE_PSK_WITH_RC4_128_SHA "TLS_ECDHE_PSK_WITH_RC4_128_SHA"
+#define TLS1_RFC_ECDH_anon_WITH_RC4_128_SHA "TLS_ECDH_anon_WITH_RC4_128_SHA"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_RC4_128_SHA "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA"
+#define TLS1_RFC_ECDHE_RSA_WITH_RC4_128_SHA "TLS_ECDHE_RSA_WITH_RC4_128_SHA"
+#define TLS1_RFC_PSK_WITH_RC4_128_SHA "TLS_PSK_WITH_RC4_128_SHA"
+#define TLS1_RFC_RSA_PSK_WITH_RC4_128_SHA "TLS_RSA_PSK_WITH_RC4_128_SHA"
+#define TLS1_RFC_DHE_PSK_WITH_RC4_128_SHA "TLS_DHE_PSK_WITH_RC4_128_SHA"
+#define TLS1_RFC_RSA_WITH_ARIA_128_GCM_SHA256 "TLS_RSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_RSA_WITH_ARIA_256_GCM_SHA384 "TLS_RSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_DHE_RSA_WITH_ARIA_128_GCM_SHA256 "TLS_DHE_RSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_DHE_RSA_WITH_ARIA_256_GCM_SHA384 "TLS_DHE_RSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_DH_RSA_WITH_ARIA_128_GCM_SHA256 "TLS_DH_RSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_DH_RSA_WITH_ARIA_256_GCM_SHA384 "TLS_DH_RSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_DHE_DSS_WITH_ARIA_128_GCM_SHA256 "TLS_DHE_DSS_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_DHE_DSS_WITH_ARIA_256_GCM_SHA384 "TLS_DHE_DSS_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_DH_DSS_WITH_ARIA_128_GCM_SHA256 "TLS_DH_DSS_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_DH_DSS_WITH_ARIA_256_GCM_SHA384 "TLS_DH_DSS_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_DH_anon_WITH_ARIA_128_GCM_SHA256 "TLS_DH_anon_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_DH_anon_WITH_ARIA_256_GCM_SHA384 "TLS_DH_anon_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256 "TLS_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384 "TLS_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256 "TLS_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384 "TLS_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256 "TLS_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384 "TLS_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_ECDH_RSA_WITH_ARIA_128_GCM_SHA256 "TLS_ECDH_RSA_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_ECDH_RSA_WITH_ARIA_256_GCM_SHA384 "TLS_ECDH_RSA_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_PSK_WITH_ARIA_128_GCM_SHA256 "TLS_PSK_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_PSK_WITH_ARIA_256_GCM_SHA384 "TLS_PSK_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_DHE_PSK_WITH_ARIA_128_GCM_SHA256 "TLS_DHE_PSK_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_DHE_PSK_WITH_ARIA_256_GCM_SHA384 "TLS_DHE_PSK_WITH_ARIA_256_GCM_SHA384"
+#define TLS1_RFC_RSA_PSK_WITH_ARIA_128_GCM_SHA256 "TLS_RSA_PSK_WITH_ARIA_128_GCM_SHA256"
+#define TLS1_RFC_RSA_PSK_WITH_ARIA_256_GCM_SHA384 "TLS_RSA_PSK_WITH_ARIA_256_GCM_SHA384"
 
 /*
  * XXX Backward compatibility alert: Older versions of OpenSSL gave some DHE
@@ -858,355 +854,355 @@ int SSL_CTX_set_tlsext_ticket_key_evp_cb
  * using DHE everywhere, though we may indefinitely maintain aliases for
  * users or configurations that used "EDH"
  */
-# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA               "DHE-DSS-RC4-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA"
 
-# define TLS1_TXT_PSK_WITH_NULL_SHA                      "PSK-NULL-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA                  "DHE-PSK-NULL-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA                  "RSA-PSK-NULL-SHA"
+#define TLS1_TXT_PSK_WITH_NULL_SHA "PSK-NULL-SHA"
+#define TLS1_TXT_DHE_PSK_WITH_NULL_SHA "DHE-PSK-NULL-SHA"
+#define TLS1_TXT_RSA_PSK_WITH_NULL_SHA "RSA-PSK-NULL-SHA"
 
 /* AES ciphersuites from RFC3268 */
-# define TLS1_TXT_RSA_WITH_AES_128_SHA                   "AES128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA                "DH-DSS-AES128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA                "DH-RSA-AES128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA               "DHE-DSS-AES128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA               "DHE-RSA-AES128-SHA"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA                   "ADH-AES128-SHA"
+#define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA"
+#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA"
+#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA "DH-RSA-AES128-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA "DHE-DSS-AES128-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA "DHE-RSA-AES128-SHA"
+#define TLS1_TXT_ADH_WITH_AES_128_SHA "ADH-AES128-SHA"
 
-# define TLS1_TXT_RSA_WITH_AES_256_SHA                   "AES256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA                "DH-DSS-AES256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA                "DH-RSA-AES256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA               "DHE-DSS-AES256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"
+#define TLS1_TXT_RSA_WITH_AES_256_SHA "AES256-SHA"
+#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA "DH-DSS-AES256-SHA"
+#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA "DH-RSA-AES256-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA "DHE-DSS-AES256-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA "DHE-RSA-AES256-SHA"
+#define TLS1_TXT_ADH_WITH_AES_256_SHA "ADH-AES256-SHA"
 
 /* ECC ciphersuites from RFC4492 */
-# define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA        "ECDH-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA        "ECDH-ECDSA-AES256-SHA"
+#define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA "ECDH-ECDSA-NULL-SHA"
+#define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA "ECDH-ECDSA-RC4-SHA"
+#define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA "ECDH-ECDSA-DES-CBC3-SHA"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA "ECDH-ECDSA-AES128-SHA"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA "ECDH-ECDSA-AES256-SHA"
 
-# define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA              "ECDHE-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA           "ECDHE-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA      "ECDHE-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA       "ECDHE-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA       "ECDHE-ECDSA-AES256-SHA"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA "ECDHE-ECDSA-NULL-SHA"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA "ECDHE-ECDSA-RC4-SHA"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA "ECDHE-ECDSA-DES-CBC3-SHA"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA "ECDHE-ECDSA-AES128-SHA"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA "ECDHE-ECDSA-AES256-SHA"
 
-# define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA                 "ECDH-RSA-NULL-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA              "ECDH-RSA-RC4-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA         "ECDH-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA          "ECDH-RSA-AES128-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA          "ECDH-RSA-AES256-SHA"
+#define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA "ECDH-RSA-NULL-SHA"
+#define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA "ECDH-RSA-RC4-SHA"
+#define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA "ECDH-RSA-DES-CBC3-SHA"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA "ECDH-RSA-AES128-SHA"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA "ECDH-RSA-AES256-SHA"
 
-# define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA                "ECDHE-RSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA             "ECDHE-RSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA        "ECDHE-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA         "ECDHE-RSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA         "ECDHE-RSA-AES256-SHA"
+#define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA "ECDHE-RSA-NULL-SHA"
+#define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA "ECDHE-RSA-RC4-SHA"
+#define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA "ECDHE-RSA-DES-CBC3-SHA"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA "ECDHE-RSA-AES128-SHA"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA "ECDHE-RSA-AES256-SHA"
 
-# define TLS1_TXT_ECDH_anon_WITH_NULL_SHA                "AECDH-NULL-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA             "AECDH-RC4-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA        "AECDH-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA         "AECDH-AES128-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA         "AECDH-AES256-SHA"
+#define TLS1_TXT_ECDH_anon_WITH_NULL_SHA "AECDH-NULL-SHA"
+#define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA "AECDH-RC4-SHA"
+#define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA "AECDH-DES-CBC3-SHA"
+#define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA "AECDH-AES128-SHA"
+#define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA "AECDH-AES256-SHA"
 
 /* PSK ciphersuites from RFC 4279 */
-# define TLS1_TXT_PSK_WITH_RC4_128_SHA                   "PSK-RC4-SHA"
-# define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA              "PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA               "PSK-AES128-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA               "PSK-AES256-CBC-SHA"
+#define TLS1_TXT_PSK_WITH_RC4_128_SHA "PSK-RC4-SHA"
+#define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA "PSK-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA "PSK-AES128-CBC-SHA"
+#define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA "PSK-AES256-CBC-SHA"
 
-# define TLS1_TXT_DHE_PSK_WITH_RC4_128_SHA               "DHE-PSK-RC4-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_3DES_EDE_CBC_SHA          "DHE-PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA           "DHE-PSK-AES128-CBC-SHA"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA           "DHE-PSK-AES256-CBC-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_RC4_128_SHA               "RSA-PSK-RC4-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_3DES_EDE_CBC_SHA          "RSA-PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA           "RSA-PSK-AES128-CBC-SHA"
-# define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA           "RSA-PSK-AES256-CBC-SHA"
+#define TLS1_TXT_DHE_PSK_WITH_RC4_128_SHA "DHE-PSK-RC4-SHA"
+#define TLS1_TXT_DHE_PSK_WITH_3DES_EDE_CBC_SHA "DHE-PSK-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA "DHE-PSK-AES128-CBC-SHA"
+#define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA "DHE-PSK-AES256-CBC-SHA"
+#define TLS1_TXT_RSA_PSK_WITH_RC4_128_SHA "RSA-PSK-RC4-SHA"
+#define TLS1_TXT_RSA_PSK_WITH_3DES_EDE_CBC_SHA "RSA-PSK-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA "RSA-PSK-AES128-CBC-SHA"
+#define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA "RSA-PSK-AES256-CBC-SHA"
 
 /* PSK ciphersuites from RFC 5487 */
-# define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256            "PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384            "PSK-AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_GCM_SHA256        "DHE-PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_GCM_SHA384        "DHE-PSK-AES256-GCM-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_AES_128_GCM_SHA256        "RSA-PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_AES_256_GCM_SHA384        "RSA-PSK-AES256-GCM-SHA384"
+#define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256 "PSK-AES128-GCM-SHA256"
+#define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384 "PSK-AES256-GCM-SHA384"
+#define TLS1_TXT_DHE_PSK_WITH_AES_128_GCM_SHA256 "DHE-PSK-AES128-GCM-SHA256"
+#define TLS1_TXT_DHE_PSK_WITH_AES_256_GCM_SHA384 "DHE-PSK-AES256-GCM-SHA384"
+#define TLS1_TXT_RSA_PSK_WITH_AES_128_GCM_SHA256 "RSA-PSK-AES128-GCM-SHA256"
+#define TLS1_TXT_RSA_PSK_WITH_AES_256_GCM_SHA384 "RSA-PSK-AES256-GCM-SHA384"
 
-# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA256            "PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA384            "PSK-AES256-CBC-SHA384"
-# define TLS1_TXT_PSK_WITH_NULL_SHA256                   "PSK-NULL-SHA256"
-# define TLS1_TXT_PSK_WITH_NULL_SHA384                   "PSK-NULL-SHA384"
+#define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA256 "PSK-AES128-CBC-SHA256"
+#define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA384 "PSK-AES256-CBC-SHA384"
+#define TLS1_TXT_PSK_WITH_NULL_SHA256 "PSK-NULL-SHA256"
+#define TLS1_TXT_PSK_WITH_NULL_SHA384 "PSK-NULL-SHA384"
 
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA256        "DHE-PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA384        "DHE-PSK-AES256-CBC-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA256               "DHE-PSK-NULL-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA384               "DHE-PSK-NULL-SHA384"
+#define TLS1_TXT_DHE_PSK_WITH_AES_128_CBC_SHA256 "DHE-PSK-AES128-CBC-SHA256"
+#define TLS1_TXT_DHE_PSK_WITH_AES_256_CBC_SHA384 "DHE-PSK-AES256-CBC-SHA384"
+#define TLS1_TXT_DHE_PSK_WITH_NULL_SHA256 "DHE-PSK-NULL-SHA256"
+#define TLS1_TXT_DHE_PSK_WITH_NULL_SHA384 "DHE-PSK-NULL-SHA384"
 
-# define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA256        "RSA-PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA384        "RSA-PSK-AES256-CBC-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA256               "RSA-PSK-NULL-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA384               "RSA-PSK-NULL-SHA384"
+#define TLS1_TXT_RSA_PSK_WITH_AES_128_CBC_SHA256 "RSA-PSK-AES128-CBC-SHA256"
+#define TLS1_TXT_RSA_PSK_WITH_AES_256_CBC_SHA384 "RSA-PSK-AES256-CBC-SHA384"
+#define TLS1_TXT_RSA_PSK_WITH_NULL_SHA256 "RSA-PSK-NULL-SHA256"
+#define TLS1_TXT_RSA_PSK_WITH_NULL_SHA384 "RSA-PSK-NULL-SHA384"
 
 /* SRP ciphersuite from RFC 5054 */
-# define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "SRP-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "SRP-RSA-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA      "SRP-DSS-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA           "SRP-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA       "SRP-RSA-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA       "SRP-DSS-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA           "SRP-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA       "SRP-RSA-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA       "SRP-DSS-AES-256-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA "SRP-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA "SRP-RSA-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA "SRP-DSS-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA "SRP-AES-128-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA "SRP-RSA-AES-128-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA "SRP-DSS-AES-128-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA "SRP-AES-256-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA "SRP-RSA-AES-256-CBC-SHA"
+#define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA "SRP-DSS-AES-256-CBC-SHA"
 
 /* Camellia ciphersuites from RFC4132 */
-# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA          "CAMELLIA128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA       "DH-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA       "DH-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA      "DHE-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA      "DHE-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA          "ADH-CAMELLIA128-SHA"
+#define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA "CAMELLIA128-SHA"
+#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA "DH-DSS-CAMELLIA128-SHA"
+#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA "DH-RSA-CAMELLIA128-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA "DHE-DSS-CAMELLIA128-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA "DHE-RSA-CAMELLIA128-SHA"
+#define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA "ADH-CAMELLIA128-SHA"
 
-# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA          "CAMELLIA256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA       "DH-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA       "DH-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA      "DHE-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA      "DHE-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA          "ADH-CAMELLIA256-SHA"
+#define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA "CAMELLIA256-SHA"
+#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA "DH-DSS-CAMELLIA256-SHA"
+#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA "DH-RSA-CAMELLIA256-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA "DHE-DSS-CAMELLIA256-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA "DHE-RSA-CAMELLIA256-SHA"
+#define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA "ADH-CAMELLIA256-SHA"
 
 /* TLS 1.2 Camellia SHA-256 ciphersuites from RFC5932 */
-# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA256               "CAMELLIA128-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256            "DH-DSS-CAMELLIA128-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256            "DH-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256           "DHE-DSS-CAMELLIA128-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256           "DHE-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA256               "ADH-CAMELLIA128-SHA256"
+#define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA256 "CAMELLIA128-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256 "DH-DSS-CAMELLIA128-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256 "DH-RSA-CAMELLIA128-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 "DHE-DSS-CAMELLIA128-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 "DHE-RSA-CAMELLIA128-SHA256"
+#define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA256 "ADH-CAMELLIA128-SHA256"
 
-# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA256               "CAMELLIA256-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256            "DH-DSS-CAMELLIA256-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256            "DH-RSA-CAMELLIA256-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256           "DHE-DSS-CAMELLIA256-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256           "DHE-RSA-CAMELLIA256-SHA256"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA256               "ADH-CAMELLIA256-SHA256"
+#define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA256 "CAMELLIA256-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256 "DH-DSS-CAMELLIA256-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256 "DH-RSA-CAMELLIA256-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 "DHE-DSS-CAMELLIA256-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 "DHE-RSA-CAMELLIA256-SHA256"
+#define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA256 "ADH-CAMELLIA256-SHA256"
 
-# define TLS1_TXT_PSK_WITH_CAMELLIA_128_CBC_SHA256               "PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_PSK_WITH_CAMELLIA_256_CBC_SHA384               "PSK-CAMELLIA256-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256           "DHE-PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384           "DHE-PSK-CAMELLIA256-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256           "RSA-PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384           "RSA-PSK-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256         "ECDHE-PSK-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384         "ECDHE-PSK-CAMELLIA256-SHA384"
+#define TLS1_TXT_PSK_WITH_CAMELLIA_128_CBC_SHA256 "PSK-CAMELLIA128-SHA256"
+#define TLS1_TXT_PSK_WITH_CAMELLIA_256_CBC_SHA384 "PSK-CAMELLIA256-SHA384"
+#define TLS1_TXT_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 "DHE-PSK-CAMELLIA128-SHA256"
+#define TLS1_TXT_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 "DHE-PSK-CAMELLIA256-SHA384"
+#define TLS1_TXT_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 "RSA-PSK-CAMELLIA128-SHA256"
+#define TLS1_TXT_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 "RSA-PSK-CAMELLIA256-SHA384"
+#define TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 "ECDHE-PSK-CAMELLIA128-SHA256"
+#define TLS1_TXT_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 "ECDHE-PSK-CAMELLIA256-SHA384"
 
 /* SEED ciphersuites from RFC4162 */
-# define TLS1_TXT_RSA_WITH_SEED_SHA                      "SEED-SHA"
-# define TLS1_TXT_DH_DSS_WITH_SEED_SHA                   "DH-DSS-SEED-SHA"
-# define TLS1_TXT_DH_RSA_WITH_SEED_SHA                   "DH-RSA-SEED-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_SEED_SHA                  "DHE-DSS-SEED-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_SEED_SHA                  "DHE-RSA-SEED-SHA"
-# define TLS1_TXT_ADH_WITH_SEED_SHA                      "ADH-SEED-SHA"
+#define TLS1_TXT_RSA_WITH_SEED_SHA "SEED-SHA"
+#define TLS1_TXT_DH_DSS_WITH_SEED_SHA "DH-DSS-SEED-SHA"
+#define TLS1_TXT_DH_RSA_WITH_SEED_SHA "DH-RSA-SEED-SHA"
+#define TLS1_TXT_DHE_DSS_WITH_SEED_SHA "DHE-DSS-SEED-SHA"
+#define TLS1_TXT_DHE_RSA_WITH_SEED_SHA "DHE-RSA-SEED-SHA"
+#define TLS1_TXT_ADH_WITH_SEED_SHA "ADH-SEED-SHA"
 
 /* TLS v1.2 ciphersuites */
-# define TLS1_TXT_RSA_WITH_NULL_SHA256                   "NULL-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_128_SHA256                "AES128-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_SHA256                "AES256-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256             "DH-DSS-AES128-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256             "DH-RSA-AES128-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256            "DHE-DSS-AES128-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256            "DHE-RSA-AES128-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256             "DH-DSS-AES256-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256             "DH-RSA-AES256-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256            "DHE-DSS-AES256-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256            "DHE-RSA-AES256-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA256                "ADH-AES128-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA256                "ADH-AES256-SHA256"
+#define TLS1_TXT_RSA_WITH_NULL_SHA256 "NULL-SHA256"
+#define TLS1_TXT_RSA_WITH_AES_128_SHA256 "AES128-SHA256"
+#define TLS1_TXT_RSA_WITH_AES_256_SHA256 "AES256-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256 "DH-DSS-AES128-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256 "DH-RSA-AES128-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256 "DHE-DSS-AES128-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256 "DHE-RSA-AES128-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256 "DH-DSS-AES256-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256 "DH-RSA-AES256-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256 "DHE-DSS-AES256-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256 "DHE-RSA-AES256-SHA256"
+#define TLS1_TXT_ADH_WITH_AES_128_SHA256 "ADH-AES128-SHA256"
+#define TLS1_TXT_ADH_WITH_AES_256_SHA256 "ADH-AES256-SHA256"
 
 /* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256            "AES128-GCM-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384            "AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256        "DHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384        "DHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256         "DH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384         "DH-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256        "DHE-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384        "DHE-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256         "DH-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384         "DH-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256            "ADH-AES128-GCM-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384            "ADH-AES256-GCM-SHA384"
+#define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256 "AES128-GCM-SHA256"
+#define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384 "AES256-GCM-SHA384"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256 "DHE-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384 "DHE-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256 "DH-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384 "DH-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256 "DHE-DSS-AES128-GCM-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384 "DHE-DSS-AES256-GCM-SHA384"
+#define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256 "DH-DSS-AES128-GCM-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384 "DH-DSS-AES256-GCM-SHA384"
+#define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256 "ADH-AES128-GCM-SHA256"
+#define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384 "ADH-AES256-GCM-SHA384"
 
 /* CCM ciphersuites from RFC6655 */
-# define TLS1_TXT_RSA_WITH_AES_128_CCM                   "AES128-CCM"
-# define TLS1_TXT_RSA_WITH_AES_256_CCM                   "AES256-CCM"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM               "DHE-RSA-AES128-CCM"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_CCM               "DHE-RSA-AES256-CCM"
+#define TLS1_TXT_RSA_WITH_AES_128_CCM "AES128-CCM"
+#define TLS1_TXT_RSA_WITH_AES_256_CCM "AES256-CCM"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM "DHE-RSA-AES128-CCM"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_CCM "DHE-RSA-AES256-CCM"
 
-# define TLS1_TXT_RSA_WITH_AES_128_CCM_8                 "AES128-CCM8"
-# define TLS1_TXT_RSA_WITH_AES_256_CCM_8                 "AES256-CCM8"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM_8             "DHE-RSA-AES128-CCM8"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_CCM_8             "DHE-RSA-AES256-CCM8"
+#define TLS1_TXT_RSA_WITH_AES_128_CCM_8 "AES128-CCM8"
+#define TLS1_TXT_RSA_WITH_AES_256_CCM_8 "AES256-CCM8"
+#define TLS1_TXT_DHE_RSA_WITH_AES_128_CCM_8 "DHE-RSA-AES128-CCM8"
+#define TLS1_TXT_DHE_RSA_WITH_AES_256_CCM_8 "DHE-RSA-AES256-CCM8"
 
-# define TLS1_TXT_PSK_WITH_AES_128_CCM                   "PSK-AES128-CCM"
-# define TLS1_TXT_PSK_WITH_AES_256_CCM                   "PSK-AES256-CCM"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CCM               "DHE-PSK-AES128-CCM"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM               "DHE-PSK-AES256-CCM"
+#define TLS1_TXT_PSK_WITH_AES_128_CCM "PSK-AES128-CCM"
+#define TLS1_TXT_PSK_WITH_AES_256_CCM "PSK-AES256-CCM"
+#define TLS1_TXT_DHE_PSK_WITH_AES_128_CCM "DHE-PSK-AES128-CCM"
+#define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM "DHE-PSK-AES256-CCM"
 
-# define TLS1_TXT_PSK_WITH_AES_128_CCM_8                 "PSK-AES128-CCM8"
-# define TLS1_TXT_PSK_WITH_AES_256_CCM_8                 "PSK-AES256-CCM8"
-# define TLS1_TXT_DHE_PSK_WITH_AES_128_CCM_8             "DHE-PSK-AES128-CCM8"
-# define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM_8             "DHE-PSK-AES256-CCM8"
+#define TLS1_TXT_PSK_WITH_AES_128_CCM_8 "PSK-AES128-CCM8"
+#define TLS1_TXT_PSK_WITH_AES_256_CCM_8 "PSK-AES256-CCM8"
+#define TLS1_TXT_DHE_PSK_WITH_AES_128_CCM_8 "DHE-PSK-AES128-CCM8"
+#define TLS1_TXT_DHE_PSK_WITH_AES_256_CCM_8 "DHE-PSK-AES256-CCM8"
 
 /* CCM ciphersuites from RFC7251 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM       "ECDHE-ECDSA-AES128-CCM"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM       "ECDHE-ECDSA-AES256-CCM"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM_8     "ECDHE-ECDSA-AES128-CCM8"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8     "ECDHE-ECDSA-AES256-CCM8"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM "ECDHE-ECDSA-AES128-CCM"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM "ECDHE-ECDSA-AES256-CCM"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CCM_8 "ECDHE-ECDSA-AES128-CCM8"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CCM_8 "ECDHE-ECDSA-AES256-CCM8"
 
 /* ECDH HMAC based ciphersuites from RFC5289 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256    "ECDHE-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384    "ECDHE-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256     "ECDH-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384     "ECDH-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256      "ECDHE-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384      "ECDHE-RSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256       "ECDH-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384       "ECDH-RSA-AES256-SHA384"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256 "ECDHE-ECDSA-AES128-SHA256"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384 "ECDHE-ECDSA-AES256-SHA384"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256 "ECDH-ECDSA-AES128-SHA256"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384 "ECDH-ECDSA-AES256-SHA384"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256 "ECDHE-RSA-AES128-SHA256"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384 "ECDHE-RSA-AES256-SHA384"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256 "ECDH-RSA-AES128-SHA256"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384 "ECDH-RSA-AES256-SHA384"
 
 /* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256    "ECDHE-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384    "ECDHE-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256     "ECDH-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384     "ECDH-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256      "ECDHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384      "ECDHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256       "ECDH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384       "ECDH-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 "ECDHE-ECDSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 "ECDHE-ECDSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 "ECDH-ECDSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 "ECDH-ECDSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256 "ECDHE-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384 "ECDHE-RSA-AES256-GCM-SHA384"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256 "ECDH-RSA-AES128-GCM-SHA256"
+#define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384 "ECDH-RSA-AES256-GCM-SHA384"
 
 /* TLS v1.2 PSK GCM ciphersuites from RFC5487 */
-# define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256            "PSK-AES128-GCM-SHA256"
-# define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384            "PSK-AES256-GCM-SHA384"
+#define TLS1_TXT_PSK_WITH_AES_128_GCM_SHA256 "PSK-AES128-GCM-SHA256"
+#define TLS1_TXT_PSK_WITH_AES_256_GCM_SHA384 "PSK-AES256-GCM-SHA384"
 
 /* ECDHE PSK ciphersuites from RFC 5489 */
-# define TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA               "ECDHE-PSK-RC4-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA          "ECDHE-PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA           "ECDHE-PSK-AES128-CBC-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA           "ECDHE-PSK-AES256-CBC-SHA"
+#define TLS1_TXT_ECDHE_PSK_WITH_RC4_128_SHA "ECDHE-PSK-RC4-SHA"
+#define TLS1_TXT_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA "ECDHE-PSK-3DES-EDE-CBC-SHA"
+#define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA "ECDHE-PSK-AES128-CBC-SHA"
+#define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA "ECDHE-PSK-AES256-CBC-SHA"
 
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA256        "ECDHE-PSK-AES128-CBC-SHA256"
-# define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA384        "ECDHE-PSK-AES256-CBC-SHA384"
+#define TLS1_TXT_ECDHE_PSK_WITH_AES_128_CBC_SHA256 "ECDHE-PSK-AES128-CBC-SHA256"
+#define TLS1_TXT_ECDHE_PSK_WITH_AES_256_CBC_SHA384 "ECDHE-PSK-AES256-CBC-SHA384"
 
-# define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA                  "ECDHE-PSK-NULL-SHA"
-# define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA256               "ECDHE-PSK-NULL-SHA256"
-# define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA384               "ECDHE-PSK-NULL-SHA384"
+#define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA "ECDHE-PSK-NULL-SHA"
+#define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA256 "ECDHE-PSK-NULL-SHA256"
+#define TLS1_TXT_ECDHE_PSK_WITH_NULL_SHA384 "ECDHE-PSK-NULL-SHA384"
 
 /* Camellia-CBC ciphersuites from RFC6367 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDHE-ECDSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDHE-ECDSA-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256  "ECDH-ECDSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384  "ECDH-ECDSA-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256   "ECDHE-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384   "ECDHE-RSA-CAMELLIA256-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256    "ECDH-RSA-CAMELLIA128-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384    "ECDH-RSA-CAMELLIA256-SHA384"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDHE-ECDSA-CAMELLIA128-SHA256"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDHE-ECDSA-CAMELLIA256-SHA384"
+#define TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDH-ECDSA-CAMELLIA128-SHA256"
+#define TLS1_TXT_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDH-ECDSA-CAMELLIA256-SHA384"
+#define TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDHE-RSA-CAMELLIA128-SHA256"
+#define TLS1_TXT_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDHE-RSA-CAMELLIA256-SHA384"
+#define TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256 "ECDH-RSA-CAMELLIA128-SHA256"
+#define TLS1_TXT_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384 "ECDH-RSA-CAMELLIA256-SHA384"
 
 /* draft-ietf-tls-chacha20-poly1305-03 */
-# define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305         "ECDHE-RSA-CHACHA20-POLY1305"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305       "ECDHE-ECDSA-CHACHA20-POLY1305"
-# define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305           "DHE-RSA-CHACHA20-POLY1305"
-# define TLS1_TXT_PSK_WITH_CHACHA20_POLY1305               "PSK-CHACHA20-POLY1305"
-# define TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305         "ECDHE-PSK-CHACHA20-POLY1305"
-# define TLS1_TXT_DHE_PSK_WITH_CHACHA20_POLY1305           "DHE-PSK-CHACHA20-POLY1305"
-# define TLS1_TXT_RSA_PSK_WITH_CHACHA20_POLY1305           "RSA-PSK-CHACHA20-POLY1305"
+#define TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 "ECDHE-RSA-CHACHA20-POLY1305"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 "ECDHE-ECDSA-CHACHA20-POLY1305"
+#define TLS1_TXT_DHE_RSA_WITH_CHACHA20_POLY1305 "DHE-RSA-CHACHA20-POLY1305"
+#define TLS1_TXT_PSK_WITH_CHACHA20_POLY1305 "PSK-CHACHA20-POLY1305"
+#define TLS1_TXT_ECDHE_PSK_WITH_CHACHA20_POLY1305 "ECDHE-PSK-CHACHA20-POLY1305"
+#define TLS1_TXT_DHE_PSK_WITH_CHACHA20_POLY1305 "DHE-PSK-CHACHA20-POLY1305"
+#define TLS1_TXT_RSA_PSK_WITH_CHACHA20_POLY1305 "RSA-PSK-CHACHA20-POLY1305"
 
 /* Aria ciphersuites from RFC6209 */
-# define TLS1_TXT_RSA_WITH_ARIA_128_GCM_SHA256             "ARIA128-GCM-SHA256"
-# define TLS1_TXT_RSA_WITH_ARIA_256_GCM_SHA384             "ARIA256-GCM-SHA384"
-# define TLS1_TXT_DHE_RSA_WITH_ARIA_128_GCM_SHA256         "DHE-RSA-ARIA128-GCM-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_ARIA_256_GCM_SHA384         "DHE-RSA-ARIA256-GCM-SHA384"
-# define TLS1_TXT_DH_RSA_WITH_ARIA_128_GCM_SHA256          "DH-RSA-ARIA128-GCM-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_ARIA_256_GCM_SHA384          "DH-RSA-ARIA256-GCM-SHA384"
-# define TLS1_TXT_DHE_DSS_WITH_ARIA_128_GCM_SHA256         "DHE-DSS-ARIA128-GCM-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_ARIA_256_GCM_SHA384         "DHE-DSS-ARIA256-GCM-SHA384"
-# define TLS1_TXT_DH_DSS_WITH_ARIA_128_GCM_SHA256          "DH-DSS-ARIA128-GCM-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_ARIA_256_GCM_SHA384          "DH-DSS-ARIA256-GCM-SHA384"
-# define TLS1_TXT_DH_anon_WITH_ARIA_128_GCM_SHA256         "ADH-ARIA128-GCM-SHA256"
-# define TLS1_TXT_DH_anon_WITH_ARIA_256_GCM_SHA384         "ADH-ARIA256-GCM-SHA384"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256     "ECDHE-ECDSA-ARIA128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384     "ECDHE-ECDSA-ARIA256-GCM-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256      "ECDH-ECDSA-ARIA128-GCM-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384      "ECDH-ECDSA-ARIA256-GCM-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256       "ECDHE-ARIA128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384       "ECDHE-ARIA256-GCM-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_ARIA_128_GCM_SHA256        "ECDH-ARIA128-GCM-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_ARIA_256_GCM_SHA384        "ECDH-ARIA256-GCM-SHA384"
-# define TLS1_TXT_PSK_WITH_ARIA_128_GCM_SHA256             "PSK-ARIA128-GCM-SHA256"
-# define TLS1_TXT_PSK_WITH_ARIA_256_GCM_SHA384             "PSK-ARIA256-GCM-SHA384"
-# define TLS1_TXT_DHE_PSK_WITH_ARIA_128_GCM_SHA256         "DHE-PSK-ARIA128-GCM-SHA256"
-# define TLS1_TXT_DHE_PSK_WITH_ARIA_256_GCM_SHA384         "DHE-PSK-ARIA256-GCM-SHA384"
-# define TLS1_TXT_RSA_PSK_WITH_ARIA_128_GCM_SHA256         "RSA-PSK-ARIA128-GCM-SHA256"
-# define TLS1_TXT_RSA_PSK_WITH_ARIA_256_GCM_SHA384         "RSA-PSK-ARIA256-GCM-SHA384"
+#define TLS1_TXT_RSA_WITH_ARIA_128_GCM_SHA256 "ARIA128-GCM-SHA256"
+#define TLS1_TXT_RSA_WITH_ARIA_256_GCM_SHA384 "ARIA256-GCM-SHA384"
+#define TLS1_TXT_DHE_RSA_WITH_ARIA_128_GCM_SHA256 "DHE-RSA-ARIA128-GCM-SHA256"
+#define TLS1_TXT_DHE_RSA_WITH_ARIA_256_GCM_SHA384 "DHE-RSA-ARIA256-GCM-SHA384"
+#define TLS1_TXT_DH_RSA_WITH_ARIA_128_GCM_SHA256 "DH-RSA-ARIA128-GCM-SHA256"
+#define TLS1_TXT_DH_RSA_WITH_ARIA_256_GCM_SHA384 "DH-RSA-ARIA256-GCM-SHA384"
+#define TLS1_TXT_DHE_DSS_WITH_ARIA_128_GCM_SHA256 "DHE-DSS-ARIA128-GCM-SHA256"
+#define TLS1_TXT_DHE_DSS_WITH_ARIA_256_GCM_SHA384 "DHE-DSS-ARIA256-GCM-SHA384"
+#define TLS1_TXT_DH_DSS_WITH_ARIA_128_GCM_SHA256 "DH-DSS-ARIA128-GCM-SHA256"
+#define TLS1_TXT_DH_DSS_WITH_ARIA_256_GCM_SHA384 "DH-DSS-ARIA256-GCM-SHA384"
+#define TLS1_TXT_DH_anon_WITH_ARIA_128_GCM_SHA256 "ADH-ARIA128-GCM-SHA256"
+#define TLS1_TXT_DH_anon_WITH_ARIA_256_GCM_SHA384 "ADH-ARIA256-GCM-SHA384"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_128_GCM_SHA256 "ECDHE-ECDSA-ARIA128-GCM-SHA256"
+#define TLS1_TXT_ECDHE_ECDSA_WITH_ARIA_256_GCM_SHA384 "ECDHE-ECDSA-ARIA256-GCM-SHA384"
+#define TLS1_TXT_ECDH_ECDSA_WITH_ARIA_128_GCM_SHA256 "ECDH-ECDSA-ARIA128-GCM-SHA256"
+#define TLS1_TXT_ECDH_ECDSA_WITH_ARIA_256_GCM_SHA384 "ECDH-ECDSA-ARIA256-GCM-SHA384"
+#define TLS1_TXT_ECDHE_RSA_WITH_ARIA_128_GCM_SHA256 "ECDHE-ARIA128-GCM-SHA256"
+#define TLS1_TXT_ECDHE_RSA_WITH_ARIA_256_GCM_SHA384 "ECDHE-ARIA256-GCM-SHA384"
+#define TLS1_TXT_ECDH_RSA_WITH_ARIA_128_GCM_SHA256 "ECDH-ARIA128-GCM-SHA256"
+#define TLS1_TXT_ECDH_RSA_WITH_ARIA_256_GCM_SHA384 "ECDH-ARIA256-GCM-SHA384"
+#define TLS1_TXT_PSK_WITH_ARIA_128_GCM_SHA256 "PSK-ARIA128-GCM-SHA256"
+#define TLS1_TXT_PSK_WITH_ARIA_256_GCM_SHA384 "PSK-ARIA256-GCM-SHA384"
+#define TLS1_TXT_DHE_PSK_WITH_ARIA_128_GCM_SHA256 "DHE-PSK-ARIA128-GCM-SHA256"
+#define TLS1_TXT_DHE_PSK_WITH_ARIA_256_GCM_SHA384 "DHE-PSK-ARIA256-GCM-SHA384"
+#define TLS1_TXT_RSA_PSK_WITH_ARIA_128_GCM_SHA256 "RSA-PSK-ARIA128-GCM-SHA256"
+#define TLS1_TXT_RSA_PSK_WITH_ARIA_256_GCM_SHA384 "RSA-PSK-ARIA256-GCM-SHA384"
 
-# define TLS_CT_RSA_SIGN                 1
-# define TLS_CT_DSS_SIGN                 2
-# define TLS_CT_RSA_FIXED_DH             3
-# define TLS_CT_DSS_FIXED_DH             4
-# define TLS_CT_ECDSA_SIGN               64
-# define TLS_CT_RSA_FIXED_ECDH           65
-# define TLS_CT_ECDSA_FIXED_ECDH         66
-# define TLS_CT_GOST01_SIGN              22
-# define TLS_CT_GOST12_IANA_SIGN         67
-# define TLS_CT_GOST12_IANA_512_SIGN     68
-# define TLS_CT_GOST12_LEGACY_SIGN       238
-# define TLS_CT_GOST12_LEGACY_512_SIGN   239
+#define TLS_CT_RSA_SIGN 1
+#define TLS_CT_DSS_SIGN 2
+#define TLS_CT_RSA_FIXED_DH 3
+#define TLS_CT_DSS_FIXED_DH 4
+#define TLS_CT_ECDSA_SIGN 64
+#define TLS_CT_RSA_FIXED_ECDH 65
+#define TLS_CT_ECDSA_FIXED_ECDH 66
+#define TLS_CT_GOST01_SIGN 22
+#define TLS_CT_GOST12_IANA_SIGN 67
+#define TLS_CT_GOST12_IANA_512_SIGN 68
+#define TLS_CT_GOST12_LEGACY_SIGN 238
+#define TLS_CT_GOST12_LEGACY_512_SIGN 239
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define TLS_CT_GOST12_SIGN TLS_CT_GOST12_LEGACY_SIGN
-#  define TLS_CT_GOST12_512_SIGN TLS_CT_GOST12_LEGACY_512_SIGN
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define TLS_CT_GOST12_SIGN TLS_CT_GOST12_LEGACY_SIGN
+#define TLS_CT_GOST12_512_SIGN TLS_CT_GOST12_LEGACY_512_SIGN
+#endif
 
 /*
  * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
  * comment there)
  */
-# define TLS_CT_NUMBER                   12
+#define TLS_CT_NUMBER 12
 
-# if defined(SSL3_CT_NUMBER)
-#  if TLS_CT_NUMBER != SSL3_CT_NUMBER
-#    error "SSL/TLS CT_NUMBER values do not match"
-#  endif
-# endif
+#if defined(SSL3_CT_NUMBER)
+#if TLS_CT_NUMBER != SSL3_CT_NUMBER
+#error "SSL/TLS CT_NUMBER values do not match"
+#endif
+#endif
 
-# define TLS1_FINISH_MAC_LENGTH          12
+#define TLS1_FINISH_MAC_LENGTH 12
 
-# define TLS_MD_MAX_CONST_SIZE                     22
+#define TLS_MD_MAX_CONST_SIZE 22
 
 /* ASCII: "client finished", in hex for EBCDIC compatibility */
-# define TLS_MD_CLIENT_FINISH_CONST                "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-# define TLS_MD_CLIENT_FINISH_CONST_SIZE           15
+#define TLS_MD_CLIENT_FINISH_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
+#define TLS_MD_CLIENT_FINISH_CONST_SIZE 15
 /* ASCII: "server finished", in hex for EBCDIC compatibility */
-# define TLS_MD_SERVER_FINISH_CONST                "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-# define TLS_MD_SERVER_FINISH_CONST_SIZE           15
+#define TLS_MD_SERVER_FINISH_CONST "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
+#define TLS_MD_SERVER_FINISH_CONST_SIZE 15
 /* ASCII: "server write key", in hex for EBCDIC compatibility */
-# define TLS_MD_SERVER_WRITE_KEY_CONST             "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE        16
+#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
+#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16
 /* ASCII: "key expansion", in hex for EBCDIC compatibility */
-# define TLS_MD_KEY_EXPANSION_CONST                "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"
-# define TLS_MD_KEY_EXPANSION_CONST_SIZE           13
+#define TLS_MD_KEY_EXPANSION_CONST "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"
+#define TLS_MD_KEY_EXPANSION_CONST_SIZE 13
 /* ASCII: "client write key", in hex for EBCDIC compatibility */
-# define TLS_MD_CLIENT_WRITE_KEY_CONST             "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-# define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE        16
+#define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
+#define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE 16
 /* ASCII: "server write key", in hex for EBCDIC compatibility */
-# define TLS_MD_SERVER_WRITE_KEY_CONST             "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE        16
+#define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
+#define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE 16
 /* ASCII: "IV block", in hex for EBCDIC compatibility */
-# define TLS_MD_IV_BLOCK_CONST                     "\x49\x56\x20\x62\x6c\x6f\x63\x6b"
-# define TLS_MD_IV_BLOCK_CONST_SIZE                8
+#define TLS_MD_IV_BLOCK_CONST "\x49\x56\x20\x62\x6c\x6f\x63\x6b"
+#define TLS_MD_IV_BLOCK_CONST_SIZE 8
 /* ASCII: "master secret", in hex for EBCDIC compatibility */
-# define TLS_MD_MASTER_SECRET_CONST                "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
-# define TLS_MD_MASTER_SECRET_CONST_SIZE           13
+#define TLS_MD_MASTER_SECRET_CONST "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
+#define TLS_MD_MASTER_SECRET_CONST_SIZE 13
 /* ASCII: "extended master secret", in hex for EBCDIC compatibility */
-# define TLS_MD_EXTENDED_MASTER_SECRET_CONST       "\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
-# define TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE  22
+#define TLS_MD_EXTENDED_MASTER_SECRET_CONST "\x65\x78\x74\x65\x6e\x64\x65\x64\x20\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
+#define TLS_MD_EXTENDED_MASTER_SECRET_CONST_SIZE 22
 
 /* TLS Session Ticket extension struct */
 struct tls_session_ticket_ext_st {
@@ -1214,7 +1210,7 @@ struct tls_session_ticket_ext_st {
     void *data;
 };
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index 2ca07f748f51..ff0fba729589 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -8,16 +8,16 @@
  */
 
 #ifndef OPENSSL_TRACE_H
-# define OPENSSL_TRACE_H
-# pragma once
+#define OPENSSL_TRACE_H
+#pragma once
 
-# include <stdarg.h>
+#include <stdarg.h>
 
-# include <openssl/bio.h>
+#include <openssl/bio.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * TRACE CATEGORIES
@@ -37,28 +37,28 @@ extern "C" {
  * it is better to register channels for all categories separately.
  * (This is how the openssl application does it.)
  */
-# define OSSL_TRACE_CATEGORY_ALL                 0 /* The fallback */
-# define OSSL_TRACE_CATEGORY_TRACE               1
-# define OSSL_TRACE_CATEGORY_INIT                2
-# define OSSL_TRACE_CATEGORY_TLS                 3
-# define OSSL_TRACE_CATEGORY_TLS_CIPHER          4
-# define OSSL_TRACE_CATEGORY_CONF                5
-# define OSSL_TRACE_CATEGORY_ENGINE_TABLE        6
-# define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT    7
-# define OSSL_TRACE_CATEGORY_PKCS5V2             8
-# define OSSL_TRACE_CATEGORY_PKCS12_KEYGEN       9
-# define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT     10
-# define OSSL_TRACE_CATEGORY_X509V3_POLICY      11
-# define OSSL_TRACE_CATEGORY_BN_CTX             12
-# define OSSL_TRACE_CATEGORY_CMP                13
-# define OSSL_TRACE_CATEGORY_STORE              14
-# define OSSL_TRACE_CATEGORY_DECODER            15
-# define OSSL_TRACE_CATEGORY_ENCODER            16
-# define OSSL_TRACE_CATEGORY_REF_COUNT          17
-# define OSSL_TRACE_CATEGORY_HTTP               18
-# define OSSL_TRACE_CATEGORY_PROVIDER           19
-# define OSSL_TRACE_CATEGORY_QUERY              20
-# define OSSL_TRACE_CATEGORY_NUM                21
+#define OSSL_TRACE_CATEGORY_ALL 0 /* The fallback */
+#define OSSL_TRACE_CATEGORY_TRACE 1
+#define OSSL_TRACE_CATEGORY_INIT 2
+#define OSSL_TRACE_CATEGORY_TLS 3
+#define OSSL_TRACE_CATEGORY_TLS_CIPHER 4
+#define OSSL_TRACE_CATEGORY_CONF 5
+#define OSSL_TRACE_CATEGORY_ENGINE_TABLE 6
+#define OSSL_TRACE_CATEGORY_ENGINE_REF_COUNT 7
+#define OSSL_TRACE_CATEGORY_PKCS5V2 8
+#define OSSL_TRACE_CATEGORY_PKCS12_KEYGEN 9
+#define OSSL_TRACE_CATEGORY_PKCS12_DECRYPT 10
+#define OSSL_TRACE_CATEGORY_X509V3_POLICY 11
+#define OSSL_TRACE_CATEGORY_BN_CTX 12
+#define OSSL_TRACE_CATEGORY_CMP 13
+#define OSSL_TRACE_CATEGORY_STORE 14
+#define OSSL_TRACE_CATEGORY_DECODER 15
+#define OSSL_TRACE_CATEGORY_ENCODER 16
+#define OSSL_TRACE_CATEGORY_REF_COUNT 17
+#define OSSL_TRACE_CATEGORY_HTTP 18
+#define OSSL_TRACE_CATEGORY_PROVIDER 19
+#define OSSL_TRACE_CATEGORY_QUERY 20
+#define OSSL_TRACE_CATEGORY_NUM 21
 /* KEEP THIS LIST IN SYNC with trace_categories[] in crypto/trace.c */
 
 /* Returns the trace category number for the given |name| */
@@ -78,7 +78,7 @@ const char *OSSL_trace_get_category_name(int num);
  *
  * Returns 1 on success and 0 on failure
  */
-int OSSL_trace_set_channel(int category, BIO* channel);
+int OSSL_trace_set_channel(int category, BIO *channel);
 
 /*
  * Attach a prefix and a suffix to the given |category|, to be printed at the
@@ -104,13 +104,13 @@ int OSSL_trace_set_suffix(int category, const char *suffix);
  * The |category| number is given, as well as a |cmd| number, described below.
  */
 typedef size_t (*OSSL_trace_cb)(const char *buffer, size_t count,
-                                int category, int cmd, void *data);
+    int category, int cmd, void *data);
 /*
  * Possible |cmd| numbers.
  */
-# define OSSL_TRACE_CTRL_BEGIN  0
-# define OSSL_TRACE_CTRL_WRITE  1
-# define OSSL_TRACE_CTRL_END    2
+#define OSSL_TRACE_CTRL_BEGIN 0
+#define OSSL_TRACE_CTRL_WRITE 1
+#define OSSL_TRACE_CTRL_END 2
 
 /*
  * Enables tracing for the given |category| by creating an internal
@@ -199,35 +199,37 @@ void OSSL_trace_end(int category, BIO *channel);
  * call OSSL_TRACE_CANCEL(category).
  */
 
-# if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
+#if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
 
-#  define OSSL_TRACE_BEGIN(category) \
-    do { \
+#define OSSL_TRACE_BEGIN(category)                                       \
+    do {                                                                 \
         BIO *trc_out = OSSL_trace_begin(OSSL_TRACE_CATEGORY_##category); \
- \
+                                                                         \
         if (trc_out != NULL)
 
-#  define OSSL_TRACE_END(category) \
-        OSSL_trace_end(OSSL_TRACE_CATEGORY_##category, trc_out); \
-    } while (0)
+#define OSSL_TRACE_END(category)                             \
+    OSSL_trace_end(OSSL_TRACE_CATEGORY_##category, trc_out); \
+    }                                                        \
+    while (0)
 
-#  define OSSL_TRACE_CANCEL(category) \
-        OSSL_trace_end(OSSL_TRACE_CATEGORY_##category, trc_out) \
+#define OSSL_TRACE_CANCEL(category) \
+    OSSL_trace_end(OSSL_TRACE_CATEGORY_##category, trc_out)
 
-# else
+#else
 
-#  define OSSL_TRACE_BEGIN(category)           \
-    do {                                        \
-        BIO *trc_out = NULL;                    \
+#define OSSL_TRACE_BEGIN(category) \
+    do {                           \
+        BIO *trc_out = NULL;       \
         if (0)
 
-#  define OSSL_TRACE_END(category)             \
-    } while(0)
+#define OSSL_TRACE_END(category) \
+    }                            \
+    while (0)
 
-#  define OSSL_TRACE_CANCEL(category)          \
+#define OSSL_TRACE_CANCEL(category) \
     ((void)0)
 
-# endif
+#endif
 
 /*
  * OSSL_TRACE_ENABLED() - Check whether tracing is enabled for |category|
@@ -238,16 +240,16 @@ void OSSL_trace_end(int category, BIO *channel);
  *         ...
  *     }
  */
-# if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
+#if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
 
-#  define OSSL_TRACE_ENABLED(category) \
+#define OSSL_TRACE_ENABLED(category) \
     OSSL_trace_enabled(OSSL_TRACE_CATEGORY_##category)
 
-# else
+#else
 
-#  define OSSL_TRACE_ENABLED(category) (0)
+#define OSSL_TRACE_ENABLED(category) (0)
 
-# endif
+#endif
 
 /*
  * OSSL_TRACE*() - OneShot Trace Macros
@@ -271,51 +273,53 @@ void OSSL_trace_end(int category, BIO *channel);
  *                42, "What do you get when you multiply six by nine?");
  */
 
-# if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
+#if !defined OPENSSL_NO_TRACE && !defined FIPS_MODULE
 
-#  define OSSL_TRACEV(category, args) \
-    OSSL_TRACE_BEGIN(category) \
-        BIO_printf args; \
+#define OSSL_TRACEV(category, args) \
+    OSSL_TRACE_BEGIN(category)      \
+    BIO_printf args;                \
     OSSL_TRACE_END(category)
 
-# else
+#else
 
-#  define OSSL_TRACEV(category, args) ((void)0)
+#define OSSL_TRACEV(category, args) ((void)0)
 
-# endif
+#endif
 
-# define OSSL_TRACE(category, text) \
+#define OSSL_TRACE(category, text) \
     OSSL_TRACEV(category, (trc_out, "%s", text))
 
-# define OSSL_TRACE1(category, format, arg1) \
+#define OSSL_TRACE1(category, format, arg1) \
     OSSL_TRACEV(category, (trc_out, format, arg1))
-# define OSSL_TRACE2(category, format, arg1, arg2) \
+#define OSSL_TRACE2(category, format, arg1, arg2) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2))
-# define OSSL_TRACE3(category, format, arg1, arg2, arg3) \
+#define OSSL_TRACE3(category, format, arg1, arg2, arg3) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3))
-# define OSSL_TRACE4(category, format, arg1, arg2, arg3, arg4) \
+#define OSSL_TRACE4(category, format, arg1, arg2, arg3, arg4) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4))
-# define OSSL_TRACE5(category, format, arg1, arg2, arg3, arg4, arg5) \
+#define OSSL_TRACE5(category, format, arg1, arg2, arg3, arg4, arg5) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5))
-# define OSSL_TRACE6(category, format, arg1, arg2, arg3, arg4, arg5, arg6) \
+#define OSSL_TRACE6(category, format, arg1, arg2, arg3, arg4, arg5, arg6) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, arg6))
-# define OSSL_TRACE7(category, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
+#define OSSL_TRACE7(category, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7))
-# define OSSL_TRACE8(category, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \
+#define OSSL_TRACE8(category, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8))
-# define OSSL_TRACE9(category, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) \
+#define OSSL_TRACE9(category, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9) \
     OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9))
 
 #define OSSL_TRACE_STRING_MAX 80
 int OSSL_trace_string(BIO *out, int text, int full,
-                      const unsigned char *data, size_t size);
+    const unsigned char *data, size_t size);
 #define OSSL_TRACE_STRING(category, text, full, data, len) \
-    OSSL_TRACE_BEGIN(category) { \
-        OSSL_trace_string(trc_out, text, full, data, len);  \
-    } OSSL_TRACE_END(category)
+    OSSL_TRACE_BEGIN(category)                             \
+    {                                                      \
+        OSSL_trace_string(trc_out, text, full, data, len); \
+    }                                                      \
+    OSSL_TRACE_END(category)
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif
diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 31c78b55a402..edb6ca17bd7a 100644
--- a/include/openssl/ts.h
+++ b/include/openssl/ts.h
@@ -8,36 +8,36 @@
  */
 
 #ifndef OPENSSL_TS_H
-# define OPENSSL_TS_H
-# pragma once
+#define OPENSSL_TS_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_TS_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_TS_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_TS
-# include <openssl/symhacks.h>
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-# include <openssl/rsa.h>
-# include <openssl/dsa.h>
-# include <openssl/dh.h>
-# include <openssl/tserr.h>
-# include <openssl/ess.h>
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
-# ifdef  __cplusplus
+#ifndef OPENSSL_NO_TS
+#include <openssl/symhacks.h>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/safestack.h>
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#include <openssl/tserr.h>
+#include <openssl/ess.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 typedef struct TS_msg_imprint_st TS_MSG_IMPRINT;
 typedef struct TS_req_st TS_REQ;
@@ -45,23 +45,22 @@ typedef struct TS_accuracy_st TS_ACCURACY;
 typedef struct TS_tst_info_st TS_TST_INFO;
 
 /* Possible values for status. */
-# define TS_STATUS_GRANTED                       0
-# define TS_STATUS_GRANTED_WITH_MODS             1
-# define TS_STATUS_REJECTION                     2
-# define TS_STATUS_WAITING                       3
-# define TS_STATUS_REVOCATION_WARNING            4
-# define TS_STATUS_REVOCATION_NOTIFICATION       5
+#define TS_STATUS_GRANTED 0
+#define TS_STATUS_GRANTED_WITH_MODS 1
+#define TS_STATUS_REJECTION 2
+#define TS_STATUS_WAITING 3
+#define TS_STATUS_REVOCATION_WARNING 4
+#define TS_STATUS_REVOCATION_NOTIFICATION 5
 
 /* Possible values for failure_info. */
-# define TS_INFO_BAD_ALG                 0
-# define TS_INFO_BAD_REQUEST             2
-# define TS_INFO_BAD_DATA_FORMAT         5
-# define TS_INFO_TIME_NOT_AVAILABLE      14
-# define TS_INFO_UNACCEPTED_POLICY       15
-# define TS_INFO_UNACCEPTED_EXTENSION    16
-# define TS_INFO_ADD_INFO_NOT_AVAILABLE  17
-# define TS_INFO_SYSTEM_FAILURE          25
-
+#define TS_INFO_BAD_ALG 0
+#define TS_INFO_BAD_REQUEST 2
+#define TS_INFO_BAD_DATA_FORMAT 5
+#define TS_INFO_TIME_NOT_AVAILABLE 14
+#define TS_INFO_UNACCEPTED_POLICY 15
+#define TS_INFO_UNACCEPTED_EXTENSION 16
+#define TS_INFO_ADD_INFO_NOT_AVAILABLE 17
+#define TS_INFO_SYSTEM_FAILURE 25
 
 typedef struct TS_status_info_st TS_STATUS_INFO;
 
@@ -216,7 +215,7 @@ void TS_TST_INFO_ext_free(TS_TST_INFO *a);
 int TS_TST_INFO_get_ext_count(TS_TST_INFO *a);
 int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos);
 int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, const ASN1_OBJECT *obj,
-                               int lastpos);
+    int lastpos);
 int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos);
 X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc);
 X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc);
@@ -230,39 +229,39 @@ void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx);
 /* Optional flags for response generation. */
 
 /* Don't include the TSA name in response. */
-# define TS_TSA_NAME             0x01
+#define TS_TSA_NAME 0x01
 
 /* Set ordering to true in response. */
-# define TS_ORDERING             0x02
+#define TS_ORDERING 0x02
 
 /*
  * Include the signer certificate and the other specified certificates in
  * the ESS signing certificate attribute beside the PKCS7 signed data.
  * Only the signer certificates is included by default.
  */
-# define TS_ESS_CERT_ID_CHAIN    0x04
+#define TS_ESS_CERT_ID_CHAIN 0x04
 
 /* Forward declaration. */
 struct TS_resp_ctx;
 
 /* This must return a unique number less than 160 bits long. */
-typedef ASN1_INTEGER *(*TS_serial_cb) (struct TS_resp_ctx *, void *);
+typedef ASN1_INTEGER *(*TS_serial_cb)(struct TS_resp_ctx *, void *);
 
 /*
  * This must return the seconds and microseconds since Jan 1, 1970 in the sec
  * and usec variables allocated by the caller. Return non-zero for success
  * and zero for failure.
  */
-typedef int (*TS_time_cb) (struct TS_resp_ctx *, void *, long *sec,
-                           long *usec);
+typedef int (*TS_time_cb)(struct TS_resp_ctx *, void *, long *sec,
+    long *usec);
 
 /*
  * This must process the given extension. It can modify the TS_TST_INFO
  * object of the context. Return values: !0 (processed), 0 (error, it must
  * set the status info/failure info of the response).
  */
-typedef int (*TS_extension_cb) (struct TS_resp_ctx *, X509_EXTENSION *,
-                                void *);
+typedef int (*TS_extension_cb)(struct TS_resp_ctx *, X509_EXTENSION *,
+    void *);
 
 typedef struct TS_resp_ctx TS_RESP_CTX;
 
@@ -278,7 +277,7 @@ int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer);
 int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key);
 
 int TS_RESP_CTX_set_signer_digest(TS_RESP_CTX *ctx,
-                                  const EVP_MD *signer_digest);
+    const EVP_MD *signer_digest);
 int TS_RESP_CTX_set_ess_cert_id_digest(TS_RESP_CTX *ctx, const EVP_MD *md);
 
 /* This parameter must be set. */
@@ -301,19 +300,19 @@ int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md);
 
 /* Accuracy is not included by default. */
 int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
-                             int secs, int millis, int micros);
+    int secs, int millis, int micros);
 
 /*
  * Clock precision digits, i.e. the number of decimal digits: '0' means sec,
  * '3' msec, '6' usec, and so on. Default is 0.
  */
 int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
-                                           unsigned clock_precision_digits);
+    unsigned clock_precision_digits);
 /* At most we accept usec precision. */
-# define TS_MAX_CLOCK_PRECISION_DIGITS   6
+#define TS_MAX_CLOCK_PRECISION_DIGITS 6
 
 /* Maximum status message length */
-# define TS_MAX_STATUS_LENGTH   (1024 * 1024)
+#define TS_MAX_STATUS_LENGTH (1024 * 1024)
 
 /* No flags are set by default. */
 void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags);
@@ -330,15 +329,15 @@ void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data);
  */
 /* FIXME: extension handling is not tested yet. */
 void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx,
-                                  TS_extension_cb cb, void *data);
+    TS_extension_cb cb, void *data);
 
 /* The following methods can be used in the callbacks. */
 int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
-                                int status, const char *text);
+    int status, const char *text);
 
 /* Sets the status info only if it is still TS_STATUS_GRANTED. */
 int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx,
-                                     int status, const char *text);
+    int status, const char *text);
 
 int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure);
 
@@ -360,49 +359,49 @@ TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio);
  */
 
 int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-                             X509_STORE *store, X509 **signer_out);
+    X509_STORE *store, X509 **signer_out);
 
 /* Context structure for the generic verify method. */
 
 /* Verify the signer's certificate and the signature of the response. */
-# define TS_VFY_SIGNATURE        (1u << 0)
+#define TS_VFY_SIGNATURE (1u << 0)
 /* Verify the version number of the response. */
-# define TS_VFY_VERSION          (1u << 1)
+#define TS_VFY_VERSION (1u << 1)
 /* Verify if the policy supplied by the user matches the policy of the TSA. */
-# define TS_VFY_POLICY           (1u << 2)
+#define TS_VFY_POLICY (1u << 2)
 /*
  * Verify the message imprint provided by the user. This flag should not be
  * specified with TS_VFY_DATA.
  */
-# define TS_VFY_IMPRINT          (1u << 3)
+#define TS_VFY_IMPRINT (1u << 3)
 /*
  * Verify the message imprint computed by the verify method from the user
  * provided data and the MD algorithm of the response. This flag should not
  * be specified with TS_VFY_IMPRINT.
  */
-# define TS_VFY_DATA             (1u << 4)
+#define TS_VFY_DATA (1u << 4)
 /* Verify the nonce value. */
-# define TS_VFY_NONCE            (1u << 5)
+#define TS_VFY_NONCE (1u << 5)
 /* Verify if the TSA name field matches the signer certificate. */
-# define TS_VFY_SIGNER           (1u << 6)
+#define TS_VFY_SIGNER (1u << 6)
 /* Verify if the TSA name field equals to the user provided name. */
-# define TS_VFY_TSA_NAME         (1u << 7)
+#define TS_VFY_TSA_NAME (1u << 7)
 
 /* You can use the following convenience constants. */
-# define TS_VFY_ALL_IMPRINT      (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_IMPRINT       \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-# define TS_VFY_ALL_DATA         (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_DATA          \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
+#define TS_VFY_ALL_IMPRINT (TS_VFY_SIGNATURE \
+    | TS_VFY_VERSION                         \
+    | TS_VFY_POLICY                          \
+    | TS_VFY_IMPRINT                         \
+    | TS_VFY_NONCE                           \
+    | TS_VFY_SIGNER                          \
+    | TS_VFY_TSA_NAME)
+#define TS_VFY_ALL_DATA (TS_VFY_SIGNATURE \
+    | TS_VFY_VERSION                      \
+    | TS_VFY_POLICY                       \
+    | TS_VFY_DATA                         \
+    | TS_VFY_NONCE                        \
+    | TS_VFY_SIGNER                       \
+    | TS_VFY_TSA_NAME)
 
 typedef struct TS_verify_ctx TS_VERIFY_CTX;
 
@@ -418,30 +417,30 @@ void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx);
 void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx);
 int TS_VERIFY_CTX_set_flags(TS_VERIFY_CTX *ctx, int f);
 int TS_VERIFY_CTX_add_flags(TS_VERIFY_CTX *ctx, int f);
-# ifndef OPENSSL_NO_DEPRECATED_3_4
+#ifndef OPENSSL_NO_DEPRECATED_3_4
 OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_data().")
 BIO *TS_VERIFY_CTX_set_data(TS_VERIFY_CTX *ctx, BIO *b);
-# endif
+#endif
 int TS_VERIFY_CTX_set0_data(TS_VERIFY_CTX *ctx, BIO *b);
-# ifndef OPENSSL_NO_DEPRECATED_3_4
+#ifndef OPENSSL_NO_DEPRECATED_3_4
 OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_imprint().")
 unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
-                                         unsigned char *hexstr, long len);
-# endif
+    unsigned char *hexstr, long len);
+#endif
 int TS_VERIFY_CTX_set0_imprint(TS_VERIFY_CTX *ctx,
-                               unsigned char *hexstr, long len);
-# ifndef OPENSSL_NO_DEPRECATED_3_4
+    unsigned char *hexstr, long len);
+#ifndef OPENSSL_NO_DEPRECATED_3_4
 OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_store().")
 X509_STORE *TS_VERIFY_CTX_set_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
-# endif
+#endif
 int TS_VERIFY_CTX_set0_store(TS_VERIFY_CTX *ctx, X509_STORE *s);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define TS_VERIFY_CTS_set_certs(ctx, cert) TS_VERIFY_CTX_set_certs(ctx,cert)
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_4
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define TS_VERIFY_CTS_set_certs(ctx, cert) TS_VERIFY_CTX_set_certs(ctx, cert)
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_4
 OSSL_DEPRECATEDIN_3_4_FOR("Unclear semantics, replace with TS_VERIFY_CTX_set0_certs().")
 STACK_OF(X509) *TS_VERIFY_CTX_set_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
-# endif
+#endif
 int TS_VERIFY_CTX_set0_certs(TS_VERIFY_CTX *ctx, STACK_OF(X509) *certs);
 
 /*-
@@ -486,37 +485,37 @@ STACK_OF(X509) *TS_CONF_load_certs(const char *file);
 EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);
 const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);
 int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
-                       TS_RESP_CTX *ctx);
+    TS_RESP_CTX *ctx);
 #ifndef OPENSSL_NO_ENGINE
 int TS_CONF_set_crypto_device(CONF *conf, const char *section,
-                              const char *device);
+    const char *device);
 int TS_CONF_set_default_engine(const char *name);
 #endif
 int TS_CONF_set_signer_cert(CONF *conf, const char *section,
-                            const char *cert, TS_RESP_CTX *ctx);
+    const char *cert, TS_RESP_CTX *ctx);
 int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
-                      TS_RESP_CTX *ctx);
+    TS_RESP_CTX *ctx);
 int TS_CONF_set_signer_key(CONF *conf, const char *section,
-                           const char *key, const char *pass,
-                           TS_RESP_CTX *ctx);
+    const char *key, const char *pass,
+    TS_RESP_CTX *ctx);
 int TS_CONF_set_signer_digest(CONF *conf, const char *section,
-                               const char *md, TS_RESP_CTX *ctx);
+    const char *md, TS_RESP_CTX *ctx);
 int TS_CONF_set_def_policy(CONF *conf, const char *section,
-                           const char *policy, TS_RESP_CTX *ctx);
+    const char *policy, TS_RESP_CTX *ctx);
 int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);
 int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx);
 int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx);
 int TS_CONF_set_clock_precision_digits(const CONF *conf, const char *section,
-                                       TS_RESP_CTX *ctx);
+    TS_RESP_CTX *ctx);
 int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx);
 int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx);
 int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
-                                  TS_RESP_CTX *ctx);
+    TS_RESP_CTX *ctx);
 int TS_CONF_set_ess_cert_id_digest(CONF *conf, const char *section,
-                                      TS_RESP_CTX *ctx);
+    TS_RESP_CTX *ctx);
 
-#  ifdef  __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 #endif
diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h
index e1b943e42dbd..0bec94a37cd3 100644
--- a/include/openssl/tserr.h
+++ b/include/openssl/tserr.h
@@ -9,59 +9,57 @@
  */
 
 #ifndef OPENSSL_TSERR_H
-# define OPENSSL_TSERR_H
-# pragma once
+#define OPENSSL_TSERR_H
+#pragma once
 
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
-
-# ifndef OPENSSL_NO_TS
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
+#ifndef OPENSSL_NO_TS
 
 /*
  * TS reason codes.
  */
-#  define TS_R_BAD_PKCS7_TYPE                              132
-#  define TS_R_BAD_TYPE                                    133
-#  define TS_R_CANNOT_LOAD_CERT                            137
-#  define TS_R_CANNOT_LOAD_KEY                             138
-#  define TS_R_CERTIFICATE_VERIFY_ERROR                    100
-#  define TS_R_COULD_NOT_SET_ENGINE                        127
-#  define TS_R_COULD_NOT_SET_TIME                          115
-#  define TS_R_DETACHED_CONTENT                            134
-#  define TS_R_ESS_ADD_SIGNING_CERT_ERROR                  116
-#  define TS_R_ESS_ADD_SIGNING_CERT_V2_ERROR               139
-#  define TS_R_ESS_SIGNING_CERTIFICATE_ERROR               101
-#  define TS_R_INVALID_NULL_POINTER                        102
-#  define TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE          117
-#  define TS_R_MESSAGE_IMPRINT_MISMATCH                    103
-#  define TS_R_NONCE_MISMATCH                              104
-#  define TS_R_NONCE_NOT_RETURNED                          105
-#  define TS_R_NO_CONTENT                                  106
-#  define TS_R_NO_TIME_STAMP_TOKEN                         107
-#  define TS_R_PKCS7_ADD_SIGNATURE_ERROR                   118
-#  define TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR                 119
-#  define TS_R_PKCS7_TO_TS_TST_INFO_FAILED                 129
-#  define TS_R_POLICY_MISMATCH                             108
-#  define TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE      120
-#  define TS_R_RESPONSE_SETUP_ERROR                        121
-#  define TS_R_SIGNATURE_FAILURE                           109
-#  define TS_R_THERE_MUST_BE_ONE_SIGNER                    110
-#  define TS_R_TIME_SYSCALL_ERROR                          122
-#  define TS_R_TOKEN_NOT_PRESENT                           130
-#  define TS_R_TOKEN_PRESENT                               131
-#  define TS_R_TSA_NAME_MISMATCH                           111
-#  define TS_R_TSA_UNTRUSTED                               112
-#  define TS_R_TST_INFO_SETUP_ERROR                        123
-#  define TS_R_TS_DATASIGN                                 124
-#  define TS_R_UNACCEPTABLE_POLICY                         125
-#  define TS_R_UNSUPPORTED_MD_ALGORITHM                    126
-#  define TS_R_UNSUPPORTED_VERSION                         113
-#  define TS_R_VAR_BAD_VALUE                               135
-#  define TS_R_VAR_LOOKUP_FAILURE                          136
-#  define TS_R_WRONG_CONTENT_TYPE                          114
+#define TS_R_BAD_PKCS7_TYPE 132
+#define TS_R_BAD_TYPE 133
+#define TS_R_CANNOT_LOAD_CERT 137
+#define TS_R_CANNOT_LOAD_KEY 138
+#define TS_R_CERTIFICATE_VERIFY_ERROR 100
+#define TS_R_COULD_NOT_SET_ENGINE 127
+#define TS_R_COULD_NOT_SET_TIME 115
+#define TS_R_DETACHED_CONTENT 134
+#define TS_R_ESS_ADD_SIGNING_CERT_ERROR 116
+#define TS_R_ESS_ADD_SIGNING_CERT_V2_ERROR 139
+#define TS_R_ESS_SIGNING_CERTIFICATE_ERROR 101
+#define TS_R_INVALID_NULL_POINTER 102
+#define TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE 117
+#define TS_R_MESSAGE_IMPRINT_MISMATCH 103
+#define TS_R_NONCE_MISMATCH 104
+#define TS_R_NONCE_NOT_RETURNED 105
+#define TS_R_NO_CONTENT 106
+#define TS_R_NO_TIME_STAMP_TOKEN 107
+#define TS_R_PKCS7_ADD_SIGNATURE_ERROR 118
+#define TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR 119
+#define TS_R_PKCS7_TO_TS_TST_INFO_FAILED 129
+#define TS_R_POLICY_MISMATCH 108
+#define TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE 120
+#define TS_R_RESPONSE_SETUP_ERROR 121
+#define TS_R_SIGNATURE_FAILURE 109
+#define TS_R_THERE_MUST_BE_ONE_SIGNER 110
+#define TS_R_TIME_SYSCALL_ERROR 122
+#define TS_R_TOKEN_NOT_PRESENT 130
+#define TS_R_TOKEN_PRESENT 131
+#define TS_R_TSA_NAME_MISMATCH 111
+#define TS_R_TSA_UNTRUSTED 112
+#define TS_R_TST_INFO_SETUP_ERROR 123
+#define TS_R_TS_DATASIGN 124
+#define TS_R_UNACCEPTABLE_POLICY 125
+#define TS_R_UNSUPPORTED_MD_ALGORITHM 126
+#define TS_R_UNSUPPORTED_VERSION 113
+#define TS_R_VAR_BAD_VALUE 135
+#define TS_R_VAR_LOOKUP_FAILURE 136
+#define TS_R_WRONG_CONTENT_TYPE 114
 
-# endif
+#endif
 #endif
diff --git a/include/openssl/txt_db.h b/include/openssl/txt_db.h
index af169a309ebc..64e9d4c04e76 100644
--- a/include/openssl/txt_db.h
+++ b/include/openssl/txt_db.h
@@ -8,28 +8,28 @@
  */
 
 #ifndef OPENSSL_TXT_DB_H
-# define OPENSSL_TXT_DB_H
-# pragma once
+#define OPENSSL_TXT_DB_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_TXT_DB_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_TXT_DB_H
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/bio.h>
-# include <openssl/safestack.h>
-# include <openssl/lhash.h>
+#include <openssl/opensslconf.h>
+#include <openssl/bio.h>
+#include <openssl/safestack.h>
+#include <openssl/lhash.h>
 
-# define DB_ERROR_OK                     0
-# define DB_ERROR_MALLOC                 1
-# define DB_ERROR_INDEX_CLASH            2
-# define DB_ERROR_INDEX_OUT_OF_RANGE     3
-# define DB_ERROR_NO_INDEX               4
-# define DB_ERROR_INSERT_INDEX_CLASH     5
-# define DB_ERROR_WRONG_NUM_FIELDS       6
+#define DB_ERROR_OK 0
+#define DB_ERROR_MALLOC 1
+#define DB_ERROR_INDEX_CLASH 2
+#define DB_ERROR_INDEX_OUT_OF_RANGE 3
+#define DB_ERROR_NO_INDEX 4
+#define DB_ERROR_INSERT_INDEX_CLASH 5
+#define DB_ERROR_WRONG_NUM_FIELDS 6
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -40,7 +40,7 @@ typedef struct txt_db_st {
     int num_fields;
     STACK_OF(OPENSSL_PSTRING) *data;
     LHASH_OF(OPENSSL_STRING) **index;
-    int (**qual) (OPENSSL_STRING *);
+    int (**qual)(OPENSSL_STRING *);
     long error;
     long arg1;
     long arg2;
@@ -49,14 +49,14 @@ typedef struct txt_db_st {
 
 TXT_DB *TXT_DB_read(BIO *in, int num);
 long TXT_DB_write(BIO *out, TXT_DB *db);
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *),
-                        OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp);
+int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
+    OPENSSL_LH_HASHFUNC hash, OPENSSL_LH_COMPFUNC cmp);
 void TXT_DB_free(TXT_DB *db);
 OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
-                                    OPENSSL_STRING *value);
+    OPENSSL_STRING *value);
 int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/openssl/types.h b/include/openssl/types.h
index 344d892a9ea7..e4d105c99197 100644
--- a/include/openssl/types.h
+++ b/include/openssl/types.h
@@ -12,54 +12,54 @@
  * See https://github.com/openssl/openssl/issues/9981
  */
 #ifdef _WIN32
-# define WINCRYPT_USE_SYMBOL_PREFIX
-# undef X509_NAME
-# undef X509_EXTENSIONS
-# undef PKCS7_SIGNER_INFO
-# undef OCSP_REQUEST
-# undef OCSP_RESPONSE
+#define WINCRYPT_USE_SYMBOL_PREFIX
+#undef X509_NAME
+#undef X509_EXTENSIONS
+#undef PKCS7_SIGNER_INFO
+#undef OCSP_REQUEST
+#undef OCSP_RESPONSE
 #endif
 
 #ifndef OPENSSL_TYPES_H
-# define OPENSSL_TYPES_H
+#define OPENSSL_TYPES_H
 
-# include <limits.h>
+#include <limits.h>
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
-# include <openssl/e_os2.h>
-# include <openssl/safestack.h>
-# include <openssl/macros.h>
+#include <openssl/e_os2.h>
+#include <openssl/safestack.h>
+#include <openssl/macros.h>
 
-# if OPENSSL_VERSION_MAJOR >= 4
-#  define OSSL_FUTURE_CONST const
-# else
-#  define OSSL_FUTURE_CONST
-# endif
+#if OPENSSL_VERSION_MAJOR >= 4
+#define OSSL_FUTURE_CONST const
+#else
+#define OSSL_FUTURE_CONST
+#endif
 
 typedef struct ossl_provider_st OSSL_PROVIDER; /* Provider Object */
 
-# ifdef NO_ASN1_TYPEDEFS
-#  define ASN1_INTEGER            ASN1_STRING
-#  define ASN1_ENUMERATED         ASN1_STRING
-#  define ASN1_BIT_STRING         ASN1_STRING
-#  define ASN1_OCTET_STRING       ASN1_STRING
-#  define ASN1_PRINTABLESTRING    ASN1_STRING
-#  define ASN1_T61STRING          ASN1_STRING
-#  define ASN1_IA5STRING          ASN1_STRING
-#  define ASN1_UTCTIME            ASN1_STRING
-#  define ASN1_GENERALIZEDTIME    ASN1_STRING
-#  define ASN1_TIME               ASN1_STRING
-#  define ASN1_GENERALSTRING      ASN1_STRING
-#  define ASN1_UNIVERSALSTRING    ASN1_STRING
-#  define ASN1_BMPSTRING          ASN1_STRING
-#  define ASN1_VISIBLESTRING      ASN1_STRING
-#  define ASN1_UTF8STRING         ASN1_STRING
-#  define ASN1_BOOLEAN            int
-#  define ASN1_NULL               int
-# else
+#ifdef NO_ASN1_TYPEDEFS
+#define ASN1_INTEGER ASN1_STRING
+#define ASN1_ENUMERATED ASN1_STRING
+#define ASN1_BIT_STRING ASN1_STRING
+#define ASN1_OCTET_STRING ASN1_STRING
+#define ASN1_PRINTABLESTRING ASN1_STRING
+#define ASN1_T61STRING ASN1_STRING
+#define ASN1_IA5STRING ASN1_STRING
+#define ASN1_UTCTIME ASN1_STRING
+#define ASN1_GENERALIZEDTIME ASN1_STRING
+#define ASN1_TIME ASN1_STRING
+#define ASN1_GENERALSTRING ASN1_STRING
+#define ASN1_UNIVERSALSTRING ASN1_STRING
+#define ASN1_BMPSTRING ASN1_STRING
+#define ASN1_VISIBLESTRING ASN1_STRING
+#define ASN1_UTF8STRING ASN1_STRING
+#define ASN1_BOOLEAN int
+#define ASN1_NULL int
+#else
 typedef struct asn1_string_st ASN1_INTEGER;
 typedef struct asn1_string_st ASN1_ENUMERATED;
 typedef struct asn1_string_st ASN1_BIT_STRING;
@@ -78,7 +78,7 @@ typedef struct asn1_string_st ASN1_UTF8STRING;
 typedef struct asn1_string_st ASN1_STRING;
 typedef int ASN1_BOOLEAN;
 typedef int ASN1_NULL;
-# endif
+#endif
 
 typedef struct asn1_type_st ASN1_TYPE;
 typedef struct asn1_object_st ASN1_OBJECT;
@@ -88,9 +88,9 @@ typedef struct ASN1_ITEM_st ASN1_ITEM;
 typedef struct asn1_pctx_st ASN1_PCTX;
 typedef struct asn1_sctx_st ASN1_SCTX;
 
-# ifdef BIGNUM
-#  undef BIGNUM
-# endif
+#ifdef BIGNUM
+#undef BIGNUM
+#endif
 
 typedef struct bio_st BIO;
 typedef struct bignum_st BIGNUM;
@@ -146,21 +146,21 @@ typedef struct hmac_ctx_st HMAC_CTX;
 typedef struct dh_st DH;
 typedef struct dh_method DH_METHOD;
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef struct dsa_st DSA;
 typedef struct dsa_method DSA_METHOD;
-# endif
+#endif
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef struct rsa_st RSA;
 typedef struct rsa_meth_st RSA_METHOD;
-# endif
+#endif
 typedef struct rsa_pss_params_st RSA_PSS_PARAMS;
 
-# ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 typedef struct ec_key_st EC_KEY;
 typedef struct ec_key_method_st EC_KEY_METHOD;
-# endif
+#endif
 
 typedef struct rand_meth_st RAND_METHOD;
 typedef struct rand_drbg_st RAND_DRBG;
@@ -232,7 +232,7 @@ typedef struct ossl_algorithm_st OSSL_ALGORITHM;
 typedef struct ossl_param_st OSSL_PARAM;
 typedef struct ossl_param_bld_st OSSL_PARAM_BLD;
 
-typedef int pem_password_cb (char *buf, int size, int rwflag, void *userdata);
+typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
 
 typedef struct ossl_encoder_st OSSL_ENCODER;
 typedef struct ossl_encoder_ctx_st OSSL_ENCODER_CTX;
@@ -241,7 +241,7 @@ typedef struct ossl_decoder_ctx_st OSSL_DECODER_CTX;
 
 typedef struct ossl_self_test_st OSSL_SELF_TEST;
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
diff --git a/include/openssl/ui.h.in b/include/openssl/ui.h.in
index eb9a580fa8f4..cbc1b6539056 100644
--- a/include/openssl/ui.h.in
+++ b/include/openssl/ui.h.in
@@ -9,39 +9,41 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_UI_H
-# define OPENSSL_UI_H
-# pragma once
+#define OPENSSL_UI_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_UI_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_UI_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  include <openssl/crypto.h>
-# endif
-# include <openssl/safestack.h>
-# include <openssl/pem.h>
-# include <openssl/types.h>
-# include <openssl/uierr.h>
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/crypto.h>
+#endif
+#include <openssl/safestack.h>
+#include <openssl/pem.h>
+#include <openssl/types.h>
+#include <openssl/uierr.h>
 
 /* For compatibility reasons, the macro OPENSSL_NO_UI is currently retained */
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifdef OPENSSL_NO_UI_CONSOLE
-#   define OPENSSL_NO_UI
-#  endif
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifdef OPENSSL_NO_UI_CONSOLE
+#define OPENSSL_NO_UI
+#endif
+#endif
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /*
  * All the following functions return -1 or NULL on error and in some cases
@@ -99,21 +101,21 @@ void UI_free(UI *ui);
    On success, the all return an index of the added information.  That index
    is useful when retrieving results with UI_get0_result(). */
 int UI_add_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
+    char *result_buf, int minsize, int maxsize);
 int UI_dup_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
+    char *result_buf, int minsize, int maxsize);
 int UI_add_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
+    char *result_buf, int minsize, int maxsize,
+    const char *test_buf);
 int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
+    char *result_buf, int minsize, int maxsize,
+    const char *test_buf);
 int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
+    const char *ok_chars, const char *cancel_chars,
+    int flags, char *result_buf);
 int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
+    const char *ok_chars, const char *cancel_chars,
+    int flags, char *result_buf);
 int UI_add_info_string(UI *ui, const char *text);
 int UI_dup_info_string(UI *ui, const char *text);
 int UI_add_error_string(UI *ui, const char *text);
@@ -121,7 +123,7 @@ int UI_dup_error_string(UI *ui, const char *text);
 
 /* These are the possible flags.  They can be or'ed together. */
 /* Use to have echoing of input */
-# define UI_INPUT_FLAG_ECHO              0x01
+#define UI_INPUT_FLAG_ECHO 0x01
 /*
  * Use a default password.  Where that password is found is completely up to
  * the application, it might for example be in the user data set with
@@ -129,7 +131,7 @@ int UI_dup_error_string(UI *ui, const char *text);
  * each UI being marked with this flag, or the application might get
  * confused.
  */
-# define UI_INPUT_FLAG_DEFAULT_PWD       0x02
+#define UI_INPUT_FLAG_DEFAULT_PWD 0x02
 
 /*-
  * The user of these routines may want to define flags of their own.  The core
@@ -140,8 +142,8 @@ int UI_dup_error_string(UI *ui, const char *text);
  *
  *    #define MY_UI_FLAG1       (0x01 << UI_INPUT_FLAG_USER_BASE)
  *
-*/
-# define UI_INPUT_FLAG_USER_BASE 16
+ */
+#define UI_INPUT_FLAG_USER_BASE 16
 
 /*-
  * The following function helps construct a prompt.
@@ -161,9 +163,9 @@ int UI_dup_error_string(UI *ui, const char *text);
  * the value "foo.key", the resulting string is:
  *
  *       "Enter pass phrase for foo.key:"
-*/
+ */
 char *UI_construct_prompt(UI *ui_method,
-                          const char *phrase_desc, const char *object_name);
+    const char *phrase_desc, const char *object_name);
 
 /*
  * The following function is used to store a pointer to user-specific data.
@@ -198,7 +200,7 @@ int UI_process(UI *ui);
  * send down an integer, a data pointer or a function pointer, as well as be
  * used to get information from a UI.
  */
-int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void));
+int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f)(void));
 
 /* The commands */
 /*
@@ -206,19 +208,19 @@ int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void));
  * OpenSSL error stack before printing any info or added error messages and
  * before any prompting.
  */
-# define UI_CTRL_PRINT_ERRORS            1
+#define UI_CTRL_PRINT_ERRORS 1
 /*
  * Check if a UI_process() is possible to do again with the same instance of
  * a user interface.  This makes UI_ctrl() return 1 if it is redoable, and 0
  * if not.
  */
-# define UI_CTRL_IS_REDOABLE             2
+#define UI_CTRL_IS_REDOABLE 2
 
 /* Some methods may use extra data */
-# define UI_set_app_data(s,arg)         UI_set_ex_data(s,0,arg)
-# define UI_get_app_data(s)             UI_get_ex_data(s,0)
+#define UI_set_app_data(s, arg) UI_set_ex_data(s, 0, arg)
+#define UI_get_app_data(s) UI_get_ex_data(s, 0)
 
-# define UI_get_ex_new_index(l, p, newf, dupf, freef) \
+#define UI_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_UI, l, p, newf, dupf, freef)
 int UI_set_ex_data(UI *r, int idx, void *arg);
 void *UI_get_ex_data(const UI *r, int idx);
@@ -229,12 +231,12 @@ const UI_METHOD *UI_get_default_method(void);
 const UI_METHOD *UI_get_method(UI *ui);
 const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
 
-# ifndef OPENSSL_NO_UI_CONSOLE
+#ifndef OPENSSL_NO_UI_CONSOLE
 
 /* The method with all the built-in thingies */
 UI_METHOD *UI_OpenSSL(void);
 
-# endif
+#endif
 
 /*
  * NULL method.  Literally does nothing, but may serve as a placeholder
@@ -291,9 +293,11 @@ const UI_METHOD *UI_null(void);
  */
 typedef struct ui_string_st UI_STRING;
 
+/* clang-format off */
 {-
     generate_stack_macros("UI_STRING");
 -}
+/* clang-format on */
 
 /*
  * The different types of strings that are currently supported. This is only
@@ -301,42 +305,41 @@ typedef struct ui_string_st UI_STRING;
  */
 enum UI_string_types {
     UIT_NONE = 0,
-    UIT_PROMPT,                 /* Prompt for a string */
-    UIT_VERIFY,                 /* Prompt for a string and verify */
-    UIT_BOOLEAN,                /* Prompt for a yes/no response */
-    UIT_INFO,                   /* Send info to the user */
-    UIT_ERROR                   /* Send an error message to the user */
+    UIT_PROMPT, /* Prompt for a string */
+    UIT_VERIFY, /* Prompt for a string and verify */
+    UIT_BOOLEAN, /* Prompt for a yes/no response */
+    UIT_INFO, /* Send info to the user */
+    UIT_ERROR /* Send an error message to the user */
 };
 
 /* Create and manipulate methods */
 UI_METHOD *UI_create_method(const char *name);
 void UI_destroy_method(UI_METHOD *ui_method);
-int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui));
+int UI_method_set_opener(UI_METHOD *method, int (*opener)(UI *ui));
 int UI_method_set_writer(UI_METHOD *method,
-                         int (*writer) (UI *ui, UI_STRING *uis));
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui));
+    int (*writer)(UI *ui, UI_STRING *uis));
+int UI_method_set_flusher(UI_METHOD *method, int (*flusher)(UI *ui));
 int UI_method_set_reader(UI_METHOD *method,
-                         int (*reader) (UI *ui, UI_STRING *uis));
-int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui));
+    int (*reader)(UI *ui, UI_STRING *uis));
+int UI_method_set_closer(UI_METHOD *method, int (*closer)(UI *ui));
 int UI_method_set_data_duplicator(UI_METHOD *method,
-                                  void *(*duplicator) (UI *ui, void *ui_data),
-                                  void (*destructor)(UI *ui, void *ui_data));
+    void *(*duplicator)(UI *ui, void *ui_data),
+    void (*destructor)(UI *ui, void *ui_data));
 int UI_method_set_prompt_constructor(UI_METHOD *method,
-                                     char *(*prompt_constructor) (UI *ui,
-                                                                  const char
-                                                                  *phrase_desc,
-                                                                  const char
-                                                                  *object_name));
+    char *(*prompt_constructor)(UI *ui,
+        const char
+            *phrase_desc,
+        const char
+            *object_name));
 int UI_method_set_ex_data(UI_METHOD *method, int idx, void *data);
-int (*UI_method_get_opener(const UI_METHOD *method)) (UI *);
-int (*UI_method_get_writer(const UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_flusher(const UI_METHOD *method)) (UI *);
-int (*UI_method_get_reader(const UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_closer(const UI_METHOD *method)) (UI *);
-char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))
-    (UI *, const char *, const char *);
-void *(*UI_method_get_data_duplicator(const UI_METHOD *method)) (UI *, void *);
-void (*UI_method_get_data_destructor(const UI_METHOD *method)) (UI *, void *);
+int (*UI_method_get_opener(const UI_METHOD *method))(UI *);
+int (*UI_method_get_writer(const UI_METHOD *method))(UI *, UI_STRING *);
+int (*UI_method_get_flusher(const UI_METHOD *method))(UI *);
+int (*UI_method_get_reader(const UI_METHOD *method))(UI *, UI_STRING *);
+int (*UI_method_get_closer(const UI_METHOD *method))(UI *);
+char *(*UI_method_get_prompt_constructor(const UI_METHOD *method))(UI *, const char *, const char *);
+void *(*UI_method_get_data_duplicator(const UI_METHOD *method))(UI *, void *);
+void (*UI_method_get_data_destructor(const UI_METHOD *method))(UI *, void *);
 const void *UI_method_get_ex_data(const UI_METHOD *method, int idx);
 
 /*
@@ -372,13 +375,12 @@ int UI_set_result_ex(UI *ui, UI_STRING *uis, const char *result, int len);
 
 /* A couple of popular utility functions */
 int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
-                           int verify);
+    int verify);
 int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
-                    int verify);
+    int verify);
 UI_METHOD *UI_UTIL_wrap_read_pem_callback(pem_password_cb *cb, int rwflag);
 
-
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h
index 473b04ed1138..5201b0311df6 100644
--- a/include/openssl/uierr.h
+++ b/include/openssl/uierr.h
@@ -9,30 +9,28 @@
  */
 
 #ifndef OPENSSL_UIERR_H
-# define OPENSSL_UIERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_UIERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * UI reason codes.
  */
-# define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS             104
-# define UI_R_INDEX_TOO_LARGE                             102
-# define UI_R_INDEX_TOO_SMALL                             103
-# define UI_R_NO_RESULT_BUFFER                            105
-# define UI_R_PROCESSING_ERROR                            107
-# define UI_R_RESULT_TOO_LARGE                            100
-# define UI_R_RESULT_TOO_SMALL                            101
-# define UI_R_SYSASSIGN_ERROR                             109
-# define UI_R_SYSDASSGN_ERROR                             110
-# define UI_R_SYSQIOW_ERROR                               111
-# define UI_R_UNKNOWN_CONTROL_COMMAND                     106
-# define UI_R_UNKNOWN_TTYGET_ERRNO_VALUE                  108
-# define UI_R_USER_DATA_DUPLICATION_UNSUPPORTED           112
+#define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS 104
+#define UI_R_INDEX_TOO_LARGE 102
+#define UI_R_INDEX_TOO_SMALL 103
+#define UI_R_NO_RESULT_BUFFER 105
+#define UI_R_PROCESSING_ERROR 107
+#define UI_R_RESULT_TOO_LARGE 100
+#define UI_R_RESULT_TOO_SMALL 101
+#define UI_R_SYSASSIGN_ERROR 109
+#define UI_R_SYSDASSGN_ERROR 110
+#define UI_R_SYSQIOW_ERROR 111
+#define UI_R_UNKNOWN_CONTROL_COMMAND 106
+#define UI_R_UNKNOWN_TTYGET_ERRNO_VALUE 108
+#define UI_R_USER_DATA_DUPLICATION_UNSUPPORTED 112
 
 #endif
diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h
index 05ba46324626..cff913453fdd 100644
--- a/include/openssl/whrlpool.h
+++ b/include/openssl/whrlpool.h
@@ -8,29 +8,29 @@
  */
 
 #ifndef OPENSSL_WHRLPOOL_H
-# define OPENSSL_WHRLPOOL_H
-# pragma once
+#define OPENSSL_WHRLPOOL_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_WHRLPOOL_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_WHRLPOOL_H
+#endif
 
-# include <openssl/opensslconf.h>
+#include <openssl/opensslconf.h>
 
-# ifndef OPENSSL_NO_WHIRLPOOL
-#  include <openssl/e_os2.h>
-#  include <stddef.h>
-#  ifdef __cplusplus
+#ifndef OPENSSL_NO_WHIRLPOOL
+#include <openssl/e_os2.h>
+#include <stddef.h>
+#ifdef __cplusplus
 extern "C" {
-#  endif
+#endif
 
-#  define WHIRLPOOL_DIGEST_LENGTH (512/8)
+#define WHIRLPOOL_DIGEST_LENGTH (512 / 8)
 
-#  if !defined(OPENSSL_NO_DEPRECATED_3_0)
+#if !defined(OPENSSL_NO_DEPRECATED_3_0)
 
-#   define WHIRLPOOL_BBLOCK        512
-#   define WHIRLPOOL_COUNTER       (256/8)
+#define WHIRLPOOL_BBLOCK 512
+#define WHIRLPOOL_COUNTER (256 / 8)
 
 typedef struct {
     union {
@@ -42,21 +42,21 @@ typedef struct {
     unsigned int bitoff;
     size_t bitlen[WHIRLPOOL_COUNTER / sizeof(size_t)];
 } WHIRLPOOL_CTX;
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 int WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
 OSSL_DEPRECATEDIN_3_0 int WHIRLPOOL_Update(WHIRLPOOL_CTX *c,
-                                           const void *inp, size_t bytes);
+    const void *inp, size_t bytes);
 OSSL_DEPRECATEDIN_3_0 void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c,
-                                               const void *inp, size_t bits);
+    const void *inp, size_t bits);
 OSSL_DEPRECATEDIN_3_0 int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c);
 OSSL_DEPRECATEDIN_3_0 unsigned char *WHIRLPOOL(const void *inp, size_t bytes,
-                                               unsigned char *md);
-#  endif
+    unsigned char *md);
+#endif
 
-#  ifdef __cplusplus
+#ifdef __cplusplus
 }
-#  endif
-# endif
+#endif
+#endif
 
 #endif
diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in
index 809b9c645d43..d7ce34482b08 100644
--- a/include/openssl/x509.h.in
+++ b/include/openssl/x509.h.in
@@ -10,62 +10,66 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_X509_H
-# define OPENSSL_X509_H
-# pragma once
+#define OPENSSL_X509_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_X509_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_X509_H
+#endif
 
-# include <openssl/e_os2.h>
-# include <openssl/types.h>
-# include <openssl/symhacks.h>
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-# include <openssl/ec.h>
+#include <openssl/e_os2.h>
+#include <openssl/types.h>
+#include <openssl/symhacks.h>
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/safestack.h>
+#include <openssl/ec.h>
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  include <openssl/rsa.h>
-#  include <openssl/dsa.h>
-#  include <openssl/dh.h>
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#endif
 
-# include <openssl/sha.h>
-# include <openssl/x509err.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/sha.h>
+#include <openssl/x509err.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 /* Needed stacks for types defined in other headers */
+/* clang-format off */
 {-
     generate_stack_macros("X509_NAME")
     .generate_stack_macros("X509")
     .generate_stack_macros("X509_REVOKED")
     .generate_stack_macros("X509_CRL");
 -}
+/* clang-format on */
 
 /* Flags for X509_get_signature_info() */
 /* Signature info is valid */
-# define X509_SIG_INFO_VALID     0x1
+#define X509_SIG_INFO_VALID 0x1
 /* Signature is suitable for TLS use */
-# define X509_SIG_INFO_TLS       0x2
+#define X509_SIG_INFO_TLS 0x2
 
-# define X509_FILETYPE_PEM       1
-# define X509_FILETYPE_ASN1      2
-# define X509_FILETYPE_DEFAULT   3
+#define X509_FILETYPE_PEM 1
+#define X509_FILETYPE_ASN1 2
+#define X509_FILETYPE_DEFAULT 3
 
 /*-
  * <https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3>:
@@ -73,23 +77,23 @@ extern "C" {
  * is 0x80, while bit `7` is 0x01 (the LSB of the integer value), bit `8` is
  * then the MSB of the second octet, or 0x8000.
  */
-# define X509v3_KU_DIGITAL_SIGNATURE     0x0080     /* (0) */
-# define X509v3_KU_NON_REPUDIATION       0x0040     /* (1) */
-# define X509v3_KU_KEY_ENCIPHERMENT      0x0020     /* (2) */
-# define X509v3_KU_DATA_ENCIPHERMENT     0x0010     /* (3) */
-# define X509v3_KU_KEY_AGREEMENT         0x0008     /* (4) */
-# define X509v3_KU_KEY_CERT_SIGN         0x0004     /* (5) */
-# define X509v3_KU_CRL_SIGN              0x0002     /* (6) */
-# define X509v3_KU_ENCIPHER_ONLY         0x0001     /* (7) */
-# define X509v3_KU_DECIPHER_ONLY         0x8000     /* (8) */
-# ifndef OPENSSL_NO_DEPRECATED_3_4
-#  define X509v3_KU_UNDEF                0xffff     /* vestigial, not used */
-# endif
+#define X509v3_KU_DIGITAL_SIGNATURE 0x0080 /* (0) */
+#define X509v3_KU_NON_REPUDIATION 0x0040 /* (1) */
+#define X509v3_KU_KEY_ENCIPHERMENT 0x0020 /* (2) */
+#define X509v3_KU_DATA_ENCIPHERMENT 0x0010 /* (3) */
+#define X509v3_KU_KEY_AGREEMENT 0x0008 /* (4) */
+#define X509v3_KU_KEY_CERT_SIGN 0x0004 /* (5) */
+#define X509v3_KU_CRL_SIGN 0x0002 /* (6) */
+#define X509v3_KU_ENCIPHER_ONLY 0x0001 /* (7) */
+#define X509v3_KU_DECIPHER_ONLY 0x8000 /* (8) */
+#ifndef OPENSSL_NO_DEPRECATED_3_4
+#define X509v3_KU_UNDEF 0xffff /* vestigial, not used */
+#endif
 
 struct X509_algor_st {
     ASN1_OBJECT *algorithm;
     ASN1_TYPE *parameter;
-} /* X509_ALGOR */ ;
+} /* X509_ALGOR */;
 
 typedef STACK_OF(X509_ALGOR) X509_ALGORS;
 
@@ -102,21 +106,27 @@ typedef struct X509_sig_st X509_SIG;
 
 typedef struct X509_name_entry_st X509_NAME_ENTRY;
 
+/* clang-format off */
 {-
     generate_stack_macros("X509_NAME_ENTRY");
 -}
+/* clang-format on */
 
-# define X509_EX_V_NETSCAPE_HACK         0x8000
-# define X509_EX_V_INIT                  0x0001
+#define X509_EX_V_NETSCAPE_HACK 0x8000
+#define X509_EX_V_INIT 0x0001
 typedef struct X509_extension_st X509_EXTENSION;
+/* clang-format off */
 {-
     generate_stack_macros("X509_EXTENSION");
 -}
+/* clang-format on */
 typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 typedef struct x509_attributes_st X509_ATTRIBUTE;
+/* clang-format off */
 {-
     generate_stack_macros("X509_ATTRIBUTE");
 -}
+/* clang-format on */
 typedef struct X509_req_info_st X509_REQ_INFO;
 typedef struct X509_req_st X509_REQ;
 typedef struct x509_cert_aux_st X509_CERT_AUX;
@@ -124,81 +134,68 @@ typedef struct x509_cinf_st X509_CINF;
 
 /* Flags for X509_print_ex() */
 
-# define X509_FLAG_COMPAT                0
-# define X509_FLAG_NO_HEADER             1L
-# define X509_FLAG_NO_VERSION            (1L << 1)
-# define X509_FLAG_NO_SERIAL             (1L << 2)
-# define X509_FLAG_NO_SIGNAME            (1L << 3)
-# define X509_FLAG_NO_ISSUER             (1L << 4)
-# define X509_FLAG_NO_VALIDITY           (1L << 5)
-# define X509_FLAG_NO_SUBJECT            (1L << 6)
-# define X509_FLAG_NO_PUBKEY             (1L << 7)
-# define X509_FLAG_NO_EXTENSIONS         (1L << 8)
-# define X509_FLAG_NO_SIGDUMP            (1L << 9)
-# define X509_FLAG_NO_AUX                (1L << 10)
-# define X509_FLAG_NO_ATTRIBUTES         (1L << 11)
-# define X509_FLAG_NO_IDS                (1L << 12)
-# define X509_FLAG_EXTENSIONS_ONLY_KID   (1L << 13)
+#define X509_FLAG_COMPAT 0
+#define X509_FLAG_NO_HEADER 1L
+#define X509_FLAG_NO_VERSION (1L << 1)
+#define X509_FLAG_NO_SERIAL (1L << 2)
+#define X509_FLAG_NO_SIGNAME (1L << 3)
+#define X509_FLAG_NO_ISSUER (1L << 4)
+#define X509_FLAG_NO_VALIDITY (1L << 5)
+#define X509_FLAG_NO_SUBJECT (1L << 6)
+#define X509_FLAG_NO_PUBKEY (1L << 7)
+#define X509_FLAG_NO_EXTENSIONS (1L << 8)
+#define X509_FLAG_NO_SIGDUMP (1L << 9)
+#define X509_FLAG_NO_AUX (1L << 10)
+#define X509_FLAG_NO_ATTRIBUTES (1L << 11)
+#define X509_FLAG_NO_IDS (1L << 12)
+#define X509_FLAG_EXTENSIONS_ONLY_KID (1L << 13)
 
 /* Flags specific to X509_NAME_print_ex() */
 
 /* The field separator information */
 
-# define XN_FLAG_SEP_MASK        (0xf << 16)
+#define XN_FLAG_SEP_MASK (0xf << 16)
 
-# define XN_FLAG_COMPAT          0/* Traditional; use old X509_NAME_print */
-# define XN_FLAG_SEP_COMMA_PLUS  (1 << 16)/* RFC2253 ,+ */
-# define XN_FLAG_SEP_CPLUS_SPC   (2 << 16)/* ,+ spaced: more readable */
-# define XN_FLAG_SEP_SPLUS_SPC   (3 << 16)/* ;+ spaced */
-# define XN_FLAG_SEP_MULTILINE   (4 << 16)/* One line per field */
+#define XN_FLAG_COMPAT 0 /* Traditional; use old X509_NAME_print */
+#define XN_FLAG_SEP_COMMA_PLUS (1 << 16) /* RFC2253 ,+ */
+#define XN_FLAG_SEP_CPLUS_SPC (2 << 16) /* ,+ spaced: more readable */
+#define XN_FLAG_SEP_SPLUS_SPC (3 << 16) /* ;+ spaced */
+#define XN_FLAG_SEP_MULTILINE (4 << 16) /* One line per field */
 
-# define XN_FLAG_DN_REV          (1 << 20)/* Reverse DN order */
+#define XN_FLAG_DN_REV (1 << 20) /* Reverse DN order */
 
 /* How the field name is shown */
 
-# define XN_FLAG_FN_MASK         (0x3 << 21)
+#define XN_FLAG_FN_MASK (0x3 << 21)
 
-# define XN_FLAG_FN_SN           0/* Object short name */
-# define XN_FLAG_FN_LN           (1 << 21)/* Object long name */
-# define XN_FLAG_FN_OID          (2 << 21)/* Always use OIDs */
-# define XN_FLAG_FN_NONE         (3 << 21)/* No field names */
+#define XN_FLAG_FN_SN 0 /* Object short name */
+#define XN_FLAG_FN_LN (1 << 21) /* Object long name */
+#define XN_FLAG_FN_OID (2 << 21) /* Always use OIDs */
+#define XN_FLAG_FN_NONE (3 << 21) /* No field names */
 
-# define XN_FLAG_SPC_EQ          (1 << 23)/* Put spaces round '=' */
+#define XN_FLAG_SPC_EQ (1 << 23) /* Put spaces round '=' */
 
 /*
  * This determines if we dump fields we don't recognise: RFC2253 requires
  * this.
  */
 
-# define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
+#define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
 
-# define XN_FLAG_FN_ALIGN        (1 << 25)/* Align field names to 20
-                                           * characters */
+#define XN_FLAG_FN_ALIGN (1 << 25) /* Align field names to 20 \
+                                    * characters */
 
 /* Complete set of RFC2253 flags */
 
-# define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | \
-                        XN_FLAG_SEP_COMMA_PLUS | \
-                        XN_FLAG_DN_REV | \
-                        XN_FLAG_FN_SN | \
-                        XN_FLAG_DUMP_UNKNOWN_FIELDS)
+#define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | XN_FLAG_SEP_COMMA_PLUS | XN_FLAG_DN_REV | XN_FLAG_FN_SN | XN_FLAG_DUMP_UNKNOWN_FIELDS)
 
 /* readable oneline form */
 
-# define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | \
-                        ASN1_STRFLGS_ESC_QUOTE | \
-                        XN_FLAG_SEP_CPLUS_SPC | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_SN)
+#define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | ASN1_STRFLGS_ESC_QUOTE | XN_FLAG_SEP_CPLUS_SPC | XN_FLAG_SPC_EQ | XN_FLAG_FN_SN)
 
 /* readable multiline form */
 
-# define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | \
-                        ASN1_STRFLGS_ESC_MSB | \
-                        XN_FLAG_SEP_MULTILINE | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_LN | \
-                        XN_FLAG_FN_ALIGN)
+#define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | ASN1_STRFLGS_ESC_MSB | XN_FLAG_SEP_MULTILINE | XN_FLAG_SPC_EQ | XN_FLAG_FN_LN | XN_FLAG_FN_ALIGN)
 
 typedef struct X509_crl_info_st X509_CRL_INFO;
 
@@ -212,7 +209,7 @@ typedef struct private_key_st {
     /* used to encrypt and decrypt */
     int key_length;
     char *key_data;
-    int key_free;               /* true if we should auto free key_data */
+    int key_free; /* true if we should auto free key_data */
     /* expanded version of 'enc_algor' */
     EVP_CIPHER_INFO cipher;
 } X509_PKEY;
@@ -225,9 +222,11 @@ typedef struct X509_info_st {
     int enc_len;
     char *enc_data;
 } X509_INFO;
+/* clang-format off */
 {-
     generate_stack_macros("X509_INFO");
 -}
+/* clang-format on */
 
 /*
  * The next 2 structures and their 8 routines are used to manipulate Netscape's
@@ -235,11 +234,11 @@ typedef struct X509_info_st {
  */
 typedef struct Netscape_spkac_st {
     X509_PUBKEY *pubkey;
-    ASN1_IA5STRING *challenge;  /* challenge sent in atlas >= PR2 */
+    ASN1_IA5STRING *challenge; /* challenge sent in atlas >= PR2 */
 } NETSCAPE_SPKAC;
 
 typedef struct Netscape_spki_st {
-    NETSCAPE_SPKAC *spkac;      /* signed public key and challenge */
+    NETSCAPE_SPKAC *spkac; /* signed public key and challenge */
     X509_ALGOR sig_algor;
     ASN1_BIT_STRING *signature;
 } NETSCAPE_SPKI;
@@ -272,7 +271,7 @@ typedef struct PBE2PARAM_st {
 } PBE2PARAM;
 
 typedef struct PBKDF2PARAM_st {
-/* Usually OCTET STRING but could be anything */
+    /* Usually OCTET STRING but could be anything */
     ASN1_TYPE *salt;
     ASN1_INTEGER *iter;
     ASN1_INTEGER *keylength;
@@ -284,7 +283,7 @@ typedef struct {
     X509_ALGOR *messageAuthScheme;
 } PBMAC1PARAM;
 
-# ifndef OPENSSL_NO_SCRYPT
+#ifndef OPENSSL_NO_SCRYPT
 typedef struct SCRYPT_PARAMS_st {
     ASN1_OCTET_STRING *salt;
     ASN1_INTEGER *costParameter;
@@ -292,37 +291,35 @@ typedef struct SCRYPT_PARAMS_st {
     ASN1_INTEGER *parallelizationParameter;
     ASN1_INTEGER *keyLength;
 } SCRYPT_PARAMS;
-# endif
+#endif
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 
-# include <openssl/x509_vfy.h>
-# include <openssl/pkcs7.h>
+#include <openssl/x509_vfy.h>
+#include <openssl/pkcs7.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-# define X509_EXT_PACK_UNKNOWN   1
-# define X509_EXT_PACK_STRING    2
+#define X509_EXT_PACK_UNKNOWN 1
+#define X509_EXT_PACK_STRING 2
 
-# define         X509_extract_key(x)     X509_get_pubkey(x)/*****/
-# define         X509_REQ_extract_key(a) X509_REQ_get_pubkey(a)
-# define         X509_name_cmp(a,b)      X509_NAME_cmp((a),(b))
+#define X509_extract_key(x) X509_get_pubkey(x) /*****/
+#define X509_REQ_extract_key(a) X509_REQ_get_pubkey(a)
+#define X509_name_cmp(a, b) X509_NAME_cmp((a), (b))
 
 void X509_CRL_set_default_method(const X509_CRL_METHOD *meth);
-X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init) (X509_CRL *crl),
-                                     int (*crl_free) (X509_CRL *crl),
-                                     int (*crl_lookup) (X509_CRL *crl,
-                                                        X509_REVOKED **ret,
-                                                        const
-                                                        ASN1_INTEGER *serial,
-                                                        const
-                                                        X509_NAME *issuer),
-                                     int (*crl_verify) (X509_CRL *crl,
-                                                        EVP_PKEY *pk));
+X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init)(X509_CRL *crl),
+    int (*crl_free)(X509_CRL *crl),
+    int (*crl_lookup)(X509_CRL *crl,
+        X509_REVOKED **ret,
+        const ASN1_INTEGER *serial,
+        const X509_NAME *issuer),
+    int (*crl_verify)(X509_CRL *crl,
+        EVP_PKEY *pk));
 void X509_CRL_METHOD_free(X509_CRL_METHOD *m);
 
 void X509_CRL_set_meth_data(X509_CRL *crl, void *dat);
@@ -334,7 +331,7 @@ int X509_verify(X509 *a, EVP_PKEY *r);
 int X509_self_signed(X509 *cert, int verify_signature);
 
 int X509_REQ_verify_ex(X509_REQ *a, EVP_PKEY *r, OSSL_LIB_CTX *libctx,
-                       const char *propq);
+    const char *propq);
 int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
 int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
 int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r);
@@ -348,7 +345,7 @@ int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki);
 
 int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent);
 int X509_signature_print(BIO *bp, const X509_ALGOR *alg,
-                         const ASN1_STRING *sig);
+    const ASN1_STRING *sig);
 
 int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
 int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx);
@@ -359,76 +356,76 @@ int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx);
 int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
 
 int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
-                       unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 int X509_digest(const X509 *data, const EVP_MD *type,
-                unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 ASN1_OCTET_STRING *X509_digest_sig(const X509 *cert,
-                                   EVP_MD **md_used, int *md_is_fallback);
+    EVP_MD **md_used, int *md_is_fallback);
 int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
-                     unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 
 X509 *X509_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
 X509_CRL *X509_CRL_load_http(const char *url, BIO *bio, BIO *rbio, int timeout);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */
-#  define X509_http_nbio(rctx, pcert) \
-      OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))
-#  define X509_CRL_http_nbio(rctx, pcrl) \
-      OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#include <openssl/http.h> /* OSSL_HTTP_REQ_CTX_nbio_d2i */
+#define X509_http_nbio(rctx, pcert) \
+    OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcert, ASN1_ITEM_rptr(X509))
+#define X509_CRL_http_nbio(rctx, pcrl) \
+    OSSL_HTTP_REQ_CTX_nbio_d2i(rctx, pcrl, ASN1_ITEM_rptr(X509_CRL))
+#endif
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 X509 *d2i_X509_fp(FILE *fp, X509 **x509);
 int i2d_X509_fp(FILE *fp, const X509 *x509);
 X509_CRL *d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl);
 int i2d_X509_CRL_fp(FILE *fp, const X509_CRL *crl);
 X509_REQ *d2i_X509_REQ_fp(FILE *fp, X509_REQ **req);
 int i2d_X509_REQ_fp(FILE *fp, const X509_REQ *req);
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 RSA *d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_RSAPrivateKey_fp(FILE *fp, const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0 RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_RSAPublicKey_fp(FILE *fp, const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0 RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_RSA_PUBKEY_fp(FILE *fp, const RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DSA
 OSSL_DEPRECATEDIN_3_0 DSA *d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_DSA_PUBKEY_fp(FILE *fp, const DSA *dsa);
 OSSL_DEPRECATEDIN_3_0 DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_DSAPrivateKey_fp(FILE *fp, const DSA *dsa);
-#   endif
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   ifndef OPENSSL_NO_EC
+#endif
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_EC
 OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey);
 OSSL_DEPRECATEDIN_3_0 int i2d_EC_PUBKEY_fp(FILE *fp, const EC_KEY *eckey);
 OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey);
 OSSL_DEPRECATEDIN_3_0 int i2d_ECPrivateKey_fp(FILE *fp, const EC_KEY *eckey);
-#   endif /* OPENSSL_NO_EC */
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_EC */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 X509_SIG *d2i_PKCS8_fp(FILE *fp, X509_SIG **p8);
 int i2d_PKCS8_fp(FILE *fp, const X509_SIG *p8);
 X509_PUBKEY *d2i_X509_PUBKEY_fp(FILE *fp, X509_PUBKEY **xpk);
 int i2d_X509_PUBKEY_fp(FILE *fp, const X509_PUBKEY *xpk);
 PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf);
+    PKCS8_PRIV_KEY_INFO **p8inf);
 int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, const PKCS8_PRIV_KEY_INFO *p8inf);
 int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, const EVP_PKEY *key);
 int i2d_PrivateKey_fp(FILE *fp, const EVP_PKEY *pkey);
 EVP_PKEY *d2i_PrivateKey_ex_fp(FILE *fp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
-                               const char *propq);
+    const char *propq);
 EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
 int i2d_PUBKEY_fp(FILE *fp, const EVP_PKEY *pkey);
 EVP_PKEY *d2i_PUBKEY_ex_fp(FILE *fp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
-                           const char *propq);
+    const char *propq);
 EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-# endif
+#endif
 
 X509 *d2i_X509_bio(BIO *bp, X509 **x509);
 int i2d_X509_bio(BIO *bp, const X509 *x509);
@@ -436,47 +433,47 @@ X509_CRL *d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl);
 int i2d_X509_CRL_bio(BIO *bp, const X509_CRL *crl);
 X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req);
 int i2d_X509_REQ_bio(BIO *bp, const X509_REQ *req);
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0 RSA *d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_RSAPrivateKey_bio(BIO *bp, const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0 RSA *d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_RSAPublicKey_bio(BIO *bp, const RSA *rsa);
 OSSL_DEPRECATEDIN_3_0 RSA *d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_RSA_PUBKEY_bio(BIO *bp, const RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   ifndef OPENSSL_NO_DSA
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DSA
 OSSL_DEPRECATEDIN_3_0 DSA *d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_DSA_PUBKEY_bio(BIO *bp, const DSA *dsa);
 OSSL_DEPRECATEDIN_3_0 DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa);
 OSSL_DEPRECATEDIN_3_0 int i2d_DSAPrivateKey_bio(BIO *bp, const DSA *dsa);
-#   endif
-#  endif
+#endif
+#endif
 
-#  ifndef OPENSSL_NO_DEPRECATED_3_0
-#   ifndef OPENSSL_NO_EC
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_EC
 OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey);
 OSSL_DEPRECATEDIN_3_0 int i2d_EC_PUBKEY_bio(BIO *bp, const EC_KEY *eckey);
 OSSL_DEPRECATEDIN_3_0 EC_KEY *d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey);
 OSSL_DEPRECATEDIN_3_0 int i2d_ECPrivateKey_bio(BIO *bp, const EC_KEY *eckey);
-#   endif /* OPENSSL_NO_EC */
-#  endif /* OPENSSL_NO_DEPRECATED_3_0 */
+#endif /* OPENSSL_NO_EC */
+#endif /* OPENSSL_NO_DEPRECATED_3_0 */
 
 X509_SIG *d2i_PKCS8_bio(BIO *bp, X509_SIG **p8);
 int i2d_PKCS8_bio(BIO *bp, const X509_SIG *p8);
 X509_PUBKEY *d2i_X509_PUBKEY_bio(BIO *bp, X509_PUBKEY **xpk);
 int i2d_X509_PUBKEY_bio(BIO *bp, const X509_PUBKEY *xpk);
 PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf);
+    PKCS8_PRIV_KEY_INFO **p8inf);
 int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, const PKCS8_PRIV_KEY_INFO *p8inf);
 int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, const EVP_PKEY *key);
 int i2d_PrivateKey_bio(BIO *bp, const EVP_PKEY *pkey);
 EVP_PKEY *d2i_PrivateKey_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
-                                const char *propq);
+    const char *propq);
 EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
 int i2d_PUBKEY_bio(BIO *bp, const EVP_PKEY *pkey);
 EVP_PKEY *d2i_PUBKEY_ex_bio(BIO *bp, EVP_PKEY **a, OSSL_LIB_CTX *libctx,
-                            const char *propq);
+    const char *propq);
 EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
 
 DECLARE_ASN1_DUP_FUNCTION(X509)
@@ -488,9 +485,9 @@ DECLARE_ASN1_DUP_FUNCTION(X509_PUBKEY)
 DECLARE_ASN1_DUP_FUNCTION(X509_REQ)
 DECLARE_ASN1_DUP_FUNCTION(X509_REVOKED)
 int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype,
-                    void *pval);
+    void *pval);
 void X509_ALGOR_get0(const ASN1_OBJECT **paobj, int *pptype,
-                     const void **ppval, const X509_ALGOR *algor);
+    const void **ppval, const X509_ALGOR *algor);
 void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md);
 int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b);
 int X509_ALGOR_copy(X509_ALGOR *dest, const X509_ALGOR *src);
@@ -501,10 +498,10 @@ DECLARE_ASN1_DUP_FUNCTION(X509_NAME_ENTRY)
 int X509_cmp_time(const ASN1_TIME *s, time_t *t);
 int X509_cmp_current_time(const ASN1_TIME *s);
 int X509_cmp_timeframe(const X509_VERIFY_PARAM *vpm,
-                       const ASN1_TIME *start, const ASN1_TIME *end);
+    const ASN1_TIME *start, const ASN1_TIME *end);
 ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
 ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
-                            int offset_day, long offset_sec, time_t *t);
+    int offset_day, long offset_sec, time_t *t);
 ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj);
 
 const char *X509_get_default_cert_area(void);
@@ -531,26 +528,26 @@ int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain);
 long X509_get_pathlen(X509 *x);
 DECLARE_ASN1_ENCODE_FUNCTIONS_only(EVP_PKEY, PUBKEY)
 EVP_PKEY *d2i_PUBKEY_ex(EVP_PKEY **a, const unsigned char **pp, long length,
-                        OSSL_LIB_CTX *libctx, const char *propq);
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0,RSA, RSA_PUBKEY)
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_DSA
-DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0,DSA, DSA_PUBKEY)
-#  endif
-# endif
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  ifndef OPENSSL_NO_EC
+    OSSL_LIB_CTX *libctx, const char *propq);
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, RSA, RSA_PUBKEY)
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_DSA
+DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, DSA, DSA_PUBKEY)
+#endif
+#endif
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#ifndef OPENSSL_NO_EC
 DECLARE_ASN1_ENCODE_FUNCTIONS_only_attr(OSSL_DEPRECATEDIN_3_0, EC_KEY, EC_PUBKEY)
-#  endif
-# endif
+#endif
+#endif
 
 DECLARE_ASN1_FUNCTIONS(X509_SIG)
 void X509_SIG_get0(const X509_SIG *sig, const X509_ALGOR **palg,
-                   const ASN1_OCTET_STRING **pdigest);
+    const ASN1_OCTET_STRING **pdigest);
 void X509_SIG_getm(X509_SIG *sig, X509_ALGOR **palg,
-                   ASN1_OCTET_STRING **pdigest);
+    ASN1_OCTET_STRING **pdigest);
 
 DECLARE_ASN1_FUNCTIONS(X509_REQ_INFO)
 DECLARE_ASN1_FUNCTIONS(X509_REQ)
@@ -577,20 +574,20 @@ DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509, l, p, newf, dupf, freef)
 int X509_set_ex_data(X509 *r, int idx, void *arg);
 void *X509_get_ex_data(const X509 *r, int idx);
-DECLARE_ASN1_ENCODE_FUNCTIONS_only(X509,X509_AUX)
+DECLARE_ASN1_ENCODE_FUNCTIONS_only(X509, X509_AUX)
 
 int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
 
 int X509_SIG_INFO_get(const X509_SIG_INFO *siginf, int *mdnid, int *pknid,
-                      int *secbits, uint32_t *flags);
+    int *secbits, uint32_t *flags);
 void X509_SIG_INFO_set(X509_SIG_INFO *siginf, int mdnid, int pknid,
-                       int secbits, uint32_t flags);
+    int secbits, uint32_t flags);
 
 int X509_get_signature_info(X509 *x, int *mdnid, int *pknid, int *secbits,
-                            uint32_t *flags);
+    uint32_t *flags);
 
 void X509_get0_signature(const ASN1_BIT_STRING **psig,
-                         const X509_ALGOR **palg, const X509 *x);
+    const X509_ALGOR **palg, const X509 *x);
 int X509_get_signature_nid(const X509 *x);
 
 void X509_set0_distinguishing_id(X509 *x, ASN1_OCTET_STRING *d_id);
@@ -610,7 +607,7 @@ X509_CRL *X509_CRL_new_ex(OSSL_LIB_CTX *libctx, const char *propq);
 
 int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
 int X509_CRL_get0_by_serial(X509_CRL *crl,
-                            X509_REVOKED **ret, const ASN1_INTEGER *serial);
+    X509_REVOKED **ret, const ASN1_INTEGER *serial);
 int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
 
 X509_PKEY *X509_PKEY_new(void);
@@ -627,29 +624,29 @@ char *X509_NAME_oneline(const X509_NAME *a, char *buf, int size);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 OSSL_DEPRECATEDIN_3_0
 int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *algor1,
-                ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey);
+    ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey);
 OSSL_DEPRECATEDIN_3_0
 int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
-                unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 OSSL_DEPRECATEDIN_3_0
 int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1, X509_ALGOR *algor2,
-              ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
-              const EVP_MD *type);
+    ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey,
+    const EVP_MD *type);
 #endif
 int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *data,
-                     unsigned char *md, unsigned int *len);
+    unsigned char *md, unsigned int *len);
 int ASN1_item_verify(const ASN1_ITEM *it, const X509_ALGOR *alg,
-                     const ASN1_BIT_STRING *signature, const void *data,
-                     EVP_PKEY *pkey);
+    const ASN1_BIT_STRING *signature, const void *data,
+    EVP_PKEY *pkey);
 int ASN1_item_verify_ctx(const ASN1_ITEM *it, const X509_ALGOR *alg,
-                         const ASN1_BIT_STRING *signature, const void *data,
-                         EVP_MD_CTX *ctx);
+    const ASN1_BIT_STRING *signature, const void *data,
+    EVP_MD_CTX *ctx);
 int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1, X509_ALGOR *algor2,
-                   ASN1_BIT_STRING *signature, const void *data,
-                   EVP_PKEY *pkey, const EVP_MD *md);
+    ASN1_BIT_STRING *signature, const void *data,
+    EVP_PKEY *pkey, const EVP_MD *md);
 int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                       X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-                       const void *data, EVP_MD_CTX *ctx);
+    X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
+    const void *data, EVP_MD_CTX *ctx);
 
 #define X509_VERSION_1 0
 #define X509_VERSION_2 1
@@ -664,7 +661,7 @@ int X509_set_issuer_name(X509 *x, const X509_NAME *name);
 X509_NAME *X509_get_issuer_name(const X509 *a);
 int X509_set_subject_name(X509 *x, const X509_NAME *name);
 X509_NAME *X509_get_subject_name(const X509 *a);
-const ASN1_TIME * X509_get0_notBefore(const X509 *x);
+const ASN1_TIME *X509_get0_notBefore(const X509 *x);
 ASN1_TIME *X509_getm_notBefore(const X509 *x);
 int X509_set1_notBefore(X509 *x, const ASN1_TIME *tm);
 const ASN1_TIME *X509_get0_notAfter(const X509 *x);
@@ -674,14 +671,13 @@ int X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
 int X509_up_ref(X509 *x);
 int X509_get_signature_type(const X509 *x);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define X509_get_notBefore X509_getm_notBefore
-#  define X509_get_notAfter X509_getm_notAfter
-#  define X509_set_notBefore X509_set1_notBefore
-#  define X509_set_notAfter X509_set1_notAfter
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define X509_get_notBefore X509_getm_notBefore
+#define X509_get_notAfter X509_getm_notAfter
+#define X509_set_notBefore X509_set1_notBefore
+#define X509_set_notAfter X509_set1_notAfter
 #endif
 
-
 /*
  * This one is only used so that a binary form can output, as in
  * i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x), &buf)
@@ -689,7 +685,7 @@ int X509_get_signature_type(const X509 *x);
 X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x);
 const STACK_OF(X509_EXTENSION) *X509_get0_extensions(const X509 *x);
 void X509_get0_uids(const X509 *x, const ASN1_BIT_STRING **piuid,
-                    const ASN1_BIT_STRING **psuid);
+    const ASN1_BIT_STRING **psuid);
 const X509_ALGOR *X509_get0_tbs_sigalg(const X509 *x);
 
 EVP_PKEY *X509_get0_pubkey(const X509 *x);
@@ -703,7 +699,7 @@ int X509_REQ_set_version(X509_REQ *x, long version);
 X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req);
 int X509_REQ_set_subject_name(X509_REQ *req, const X509_NAME *name);
 void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-                             const X509_ALGOR **palg);
+    const X509_ALGOR **palg);
 void X509_REQ_set0_signature(X509_REQ *req, ASN1_BIT_STRING *psig);
 int X509_REQ_set1_signature_algo(X509_REQ *req, X509_ALGOR *palg);
 int X509_REQ_get_signature_nid(const X509_REQ *req);
@@ -717,24 +713,24 @@ int *X509_REQ_get_extension_nids(void);
 void X509_REQ_set_extension_nids(int *nids);
 STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(OSSL_FUTURE_CONST X509_REQ *req);
 int X509_REQ_add_extensions_nid(X509_REQ *req,
-                                const STACK_OF(X509_EXTENSION) *exts, int nid);
+    const STACK_OF(X509_EXTENSION) *exts, int nid);
 int X509_REQ_add_extensions(X509_REQ *req, const STACK_OF(X509_EXTENSION) *ext);
 int X509_REQ_get_attr_count(const X509_REQ *req);
 int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos);
 int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
-                             int lastpos);
+    int lastpos);
 X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
 X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
 int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr);
 int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
+    const ASN1_OBJECT *obj, int type,
+    const unsigned char *bytes, int len);
 int X509_REQ_add1_attr_by_NID(X509_REQ *req,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
+    int nid, int type,
+    const unsigned char *bytes, int len);
 int X509_REQ_add1_attr_by_txt(X509_REQ *req,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
+    const char *attrname, int type,
+    const unsigned char *bytes, int len);
 
 #define X509_CRL_VERSION_1 0
 #define X509_CRL_VERSION_2 1
@@ -746,9 +742,9 @@ int X509_CRL_set1_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
 int X509_CRL_sort(X509_CRL *crl);
 int X509_CRL_up_ref(X509_CRL *crl);
 
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define X509_CRL_set_lastUpdate X509_CRL_set1_lastUpdate
-#  define X509_CRL_set_nextUpdate X509_CRL_set1_nextUpdate
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define X509_CRL_set_lastUpdate X509_CRL_set1_lastUpdate
+#define X509_CRL_set_nextUpdate X509_CRL_set1_nextUpdate
 #endif
 
 long X509_CRL_get_version(const X509_CRL *crl);
@@ -762,7 +758,7 @@ X509_NAME *X509_CRL_get_issuer(const X509_CRL *crl);
 const STACK_OF(X509_EXTENSION) *X509_CRL_get0_extensions(const X509_CRL *crl);
 STACK_OF(X509_REVOKED) *X509_CRL_get_REVOKED(X509_CRL *crl);
 void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
-                             const X509_ALGOR **palg);
+    const X509_ALGOR **palg);
 int X509_CRL_get_signature_nid(const X509_CRL *crl);
 int i2d_re_X509_CRL_tbs(X509_CRL *req, unsigned char **pp);
 
@@ -774,14 +770,14 @@ const STACK_OF(X509_EXTENSION) *
 X509_REVOKED_get0_extensions(const X509_REVOKED *r);
 
 X509_CRL *X509_CRL_diff(X509_CRL *base, X509_CRL *newer,
-                        EVP_PKEY *skey, const EVP_MD *md, unsigned int flags);
+    EVP_PKEY *skey, const EVP_MD *md, unsigned int flags);
 
 int X509_REQ_check_private_key(const X509_REQ *req, EVP_PKEY *pkey);
 
 int X509_check_private_key(const X509 *cert, const EVP_PKEY *pkey);
 int X509_chain_check_suiteb(int *perror_depth,
-                            X509 *x, STACK_OF(X509) *chain,
-                            unsigned long flags);
+    X509 *x, STACK_OF(X509) *chain,
+    unsigned long flags);
 int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags);
 void OSSL_STACK_OF_X509_free(STACK_OF(X509) *certs);
 STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain);
@@ -795,61 +791,61 @@ unsigned long X509_issuer_name_hash(X509 *a);
 int X509_subject_name_cmp(const X509 *a, const X509 *b);
 unsigned long X509_subject_name_hash(X509 *x);
 
-# ifndef OPENSSL_NO_MD5
+#ifndef OPENSSL_NO_MD5
 unsigned long X509_issuer_name_hash_old(X509 *a);
 unsigned long X509_subject_name_hash_old(X509 *x);
-# endif
+#endif
 
-# define X509_ADD_FLAG_DEFAULT  0
-# define X509_ADD_FLAG_UP_REF   0x1
-# define X509_ADD_FLAG_PREPEND  0x2
-# define X509_ADD_FLAG_NO_DUP   0x4
-# define X509_ADD_FLAG_NO_SS    0x8
+#define X509_ADD_FLAG_DEFAULT 0
+#define X509_ADD_FLAG_UP_REF 0x1
+#define X509_ADD_FLAG_PREPEND 0x2
+#define X509_ADD_FLAG_NO_DUP 0x4
+#define X509_ADD_FLAG_NO_SS 0x8
 int X509_add_cert(STACK_OF(X509) *sk, X509 *cert, int flags);
 int X509_add_certs(STACK_OF(X509) *sk, STACK_OF(X509) *certs, int flags);
 
 int X509_cmp(const X509 *a, const X509 *b);
 int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b);
 #ifndef OPENSSL_NO_DEPRECATED_3_0
-# define X509_NAME_hash(x) X509_NAME_hash_ex(x, NULL, NULL, NULL)
+#define X509_NAME_hash(x) X509_NAME_hash_ex(x, NULL, NULL, NULL)
 OSSL_DEPRECATEDIN_3_0 int X509_certificate_type(const X509 *x,
-                                                const EVP_PKEY *pubkey);
+    const EVP_PKEY *pubkey);
 #endif
 unsigned long X509_NAME_hash_ex(const X509_NAME *x, OSSL_LIB_CTX *libctx,
-                                const char *propq, int *ok);
+    const char *propq, int *ok);
 unsigned long X509_NAME_hash_old(const X509_NAME *x);
 
 int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
 int X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
 int X509_aux_print(BIO *out, X509 *x, int indent);
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 int X509_print_ex_fp(FILE *bp, X509 *x, unsigned long nmflag,
-                     unsigned long cflag);
+    unsigned long cflag);
 int X509_print_fp(FILE *bp, X509 *x);
 int X509_CRL_print_fp(FILE *bp, X509_CRL *x);
 int X509_REQ_print_fp(FILE *bp, X509_REQ *req);
 int X509_NAME_print_ex_fp(FILE *fp, const X509_NAME *nm, int indent,
-                          unsigned long flags);
-# endif
+    unsigned long flags);
+#endif
 
 int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase);
 int X509_NAME_print_ex(BIO *out, const X509_NAME *nm, int indent,
-                       unsigned long flags);
+    unsigned long flags);
 int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflag,
-                  unsigned long cflag);
+    unsigned long cflag);
 int X509_print(BIO *bp, X509 *x);
 int X509_ocspid_print(BIO *bp, X509 *x);
 int X509_CRL_print_ex(BIO *out, X509_CRL *x, unsigned long nmflag);
 int X509_CRL_print(BIO *bp, X509_CRL *x);
 int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag,
-                      unsigned long cflag);
+    unsigned long cflag);
 int X509_REQ_print(BIO *bp, X509_REQ *req);
 
 int X509_NAME_entry_count(const X509_NAME *name);
 int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid,
-                              char *buf, int len);
+    char *buf, int len);
 int X509_NAME_get_text_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
-                              char *buf, int len);
+    char *buf, int len);
 
 /*
  * NOTE: you should be passing -1, not 0 as lastpos. The functions that use
@@ -857,55 +853,55 @@ int X509_NAME_get_text_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
  */
 int X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos);
 int X509_NAME_get_index_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
-                               int lastpos);
+    int lastpos);
 X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc);
 X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
 int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *ne,
-                        int loc, int set);
+    int loc, int set);
 int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
+    const unsigned char *bytes, int len, int loc,
+    int set);
 int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
+    const unsigned char *bytes, int len, int loc,
+    int set);
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
-                                               const char *field, int type,
-                                               const unsigned char *bytes,
-                                               int len);
+    const char *field, int type,
+    const unsigned char *bytes,
+    int len);
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-                                               int type,
-                                               const unsigned char *bytes,
-                                               int len);
+    int type,
+    const unsigned char *bytes,
+    int len);
 int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
+    const unsigned char *bytes, int len, int loc,
+    int set);
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-                                               const ASN1_OBJECT *obj, int type,
-                                               const unsigned char *bytes,
-                                               int len);
+    const ASN1_OBJECT *obj, int type,
+    const unsigned char *bytes,
+    int len);
 int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj);
 int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-                             const unsigned char *bytes, int len);
+    const unsigned char *bytes, int len);
 ASN1_OBJECT *X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne);
-ASN1_STRING * X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne);
+ASN1_STRING *X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne);
 int X509_NAME_ENTRY_set(const X509_NAME_ENTRY *ne);
 
 int X509_NAME_get0_der(const X509_NAME *nm, const unsigned char **pder,
-                       size_t *pderlen);
+    size_t *pderlen);
 
 int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
 int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
-                          int nid, int lastpos);
+    int nid, int lastpos);
 int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *x,
-                          const ASN1_OBJECT *obj, int lastpos);
+    const ASN1_OBJECT *obj, int lastpos);
 int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-                               int crit, int lastpos);
+    int crit, int lastpos);
 X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
 X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
 STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-                                         X509_EXTENSION *ex, int loc);
+    X509_EXTENSION *ex, int loc);
 STACK_OF(X509_EXTENSION) *X509v3_add_extensions(STACK_OF(X509_EXTENSION) **target,
-                                                const STACK_OF(X509_EXTENSION) *exts);
+    const STACK_OF(X509_EXTENSION) *exts);
 
 int X509_get_ext_count(const X509 *x);
 int X509_get_ext_by_NID(const X509 *x, int nid, int lastpos);
@@ -916,40 +912,40 @@ X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
 int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
 void *X509_get_ext_d2i(const X509 *x, int nid, int *crit, int *idx);
 int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
-                      unsigned long flags);
+    unsigned long flags);
 
 int X509_CRL_get_ext_count(const X509_CRL *x);
 int X509_CRL_get_ext_by_NID(const X509_CRL *x, int nid, int lastpos);
 int X509_CRL_get_ext_by_OBJ(const X509_CRL *x, const ASN1_OBJECT *obj,
-                            int lastpos);
+    int lastpos);
 int X509_CRL_get_ext_by_critical(const X509_CRL *x, int crit, int lastpos);
 X509_EXTENSION *X509_CRL_get_ext(const X509_CRL *x, int loc);
 X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);
 int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
 void *X509_CRL_get_ext_d2i(const X509_CRL *x, int nid, int *crit, int *idx);
 int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
-                          unsigned long flags);
+    unsigned long flags);
 
 int X509_REVOKED_get_ext_count(const X509_REVOKED *x);
 int X509_REVOKED_get_ext_by_NID(const X509_REVOKED *x, int nid, int lastpos);
 int X509_REVOKED_get_ext_by_OBJ(const X509_REVOKED *x, const ASN1_OBJECT *obj,
-                                int lastpos);
+    int lastpos);
 int X509_REVOKED_get_ext_by_critical(const X509_REVOKED *x, int crit,
-                                     int lastpos);
+    int lastpos);
 X509_EXTENSION *X509_REVOKED_get_ext(const X509_REVOKED *x, int loc);
 X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
 int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
 void *X509_REVOKED_get_ext_d2i(const X509_REVOKED *x, int nid, int *crit,
-                               int *idx);
+    int *idx);
 int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
-                              unsigned long flags);
+    unsigned long flags);
 
 X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
-                                             int nid, int crit,
-                                             ASN1_OCTET_STRING *data);
+    int nid, int crit,
+    ASN1_OCTET_STRING *data);
 X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-                                             const ASN1_OBJECT *obj, int crit,
-                                             ASN1_OCTET_STRING *data);
+    const ASN1_OBJECT *obj, int crit,
+    ASN1_OCTET_STRING *data);
 int X509_EXTENSION_set_object(X509_EXTENSION *ex, const ASN1_OBJECT *obj);
 int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
 int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data);
@@ -959,45 +955,48 @@ int X509_EXTENSION_get_critical(const X509_EXTENSION *ex);
 
 int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
 int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
-                           int lastpos);
+    int lastpos);
 int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
-                           const ASN1_OBJECT *obj, int lastpos);
+    const ASN1_OBJECT *obj, int lastpos);
 X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc);
 X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
 STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                           X509_ATTRIBUTE *attr);
+    X509_ATTRIBUTE *attr);
 STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const ASN1_OBJECT *obj,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
+                                                      **x,
+    const ASN1_OBJECT *obj,
+    int type,
+    const unsigned char *bytes,
+    int len);
 STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, int nid, int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
+                                                      **x,
+    int nid, int type,
+    const unsigned char *bytes,
+    int len);
 STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const char *attrname,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
+                                                      **x,
+    const char *attrname,
+    int type,
+    const unsigned char *bytes,
+    int len);
 void *X509at_get0_data_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *x,
-                              const ASN1_OBJECT *obj, int lastpos, int type);
+    const ASN1_OBJECT *obj, int lastpos, int type);
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
-                                             int atrtype, const void *data,
-                                             int len);
+    int atrtype, const void *data,
+    int len);
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
-                                             const ASN1_OBJECT *obj,
-                                             int atrtype, const void *data,
-                                             int len);
+    const ASN1_OBJECT *obj,
+    int atrtype, const void *data,
+    int len);
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
-                                             const char *atrname, int type,
-                                             const unsigned char *bytes,
-                                             int len);
+    const char *atrname, int type,
+    const unsigned char *bytes,
+    int len);
 int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj);
 int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
-                             const void *data, int len);
+    const void *data, int len);
 void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype,
-                               void *data);
+    void *data);
 int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr);
 ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
 ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
@@ -1005,67 +1004,67 @@ ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
 int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
 int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos);
 int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj,
-                             int lastpos);
+    int lastpos);
 X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
 X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
 int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr);
 int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
+    const ASN1_OBJECT *obj, int type,
+    const unsigned char *bytes, int len);
 int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
+    int nid, int type,
+    const unsigned char *bytes, int len);
 int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
+    const char *attrname, int type,
+    const unsigned char *bytes, int len);
 
 /* lookup a cert from a X509 STACK */
 X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, const X509_NAME *name,
-                                     const ASN1_INTEGER *serial);
+    const ASN1_INTEGER *serial);
 X509 *X509_find_by_subject(STACK_OF(X509) *sk, const X509_NAME *name);
 
 DECLARE_ASN1_FUNCTIONS(PBEPARAM)
 DECLARE_ASN1_FUNCTIONS(PBE2PARAM)
 DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
 DECLARE_ASN1_FUNCTIONS(PBMAC1PARAM)
-# ifndef OPENSSL_NO_SCRYPT
+#ifndef OPENSSL_NO_SCRYPT
 DECLARE_ASN1_FUNCTIONS(SCRYPT_PARAMS)
-# endif
+#endif
 
 int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
-                         const unsigned char *salt, int saltlen);
+    const unsigned char *salt, int saltlen);
 int PKCS5_pbe_set0_algor_ex(X509_ALGOR *algor, int alg, int iter,
-                            const unsigned char *salt, int saltlen,
-                            OSSL_LIB_CTX *libctx);
+    const unsigned char *salt, int saltlen,
+    OSSL_LIB_CTX *libctx);
 
 X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-                          const unsigned char *salt, int saltlen);
+    const unsigned char *salt, int saltlen);
 X509_ALGOR *PKCS5_pbe_set_ex(int alg, int iter,
-                             const unsigned char *salt, int saltlen,
-                             OSSL_LIB_CTX *libctx);
+    const unsigned char *salt, int saltlen,
+    OSSL_LIB_CTX *libctx);
 
 X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                           unsigned char *salt, int saltlen);
+    unsigned char *salt, int saltlen);
 X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
-                              unsigned char *salt, int saltlen,
-                              unsigned char *aiv, int prf_nid);
+    unsigned char *salt, int saltlen,
+    unsigned char *aiv, int prf_nid);
 X509_ALGOR *PKCS5_pbe2_set_iv_ex(const EVP_CIPHER *cipher, int iter,
-                                 unsigned char *salt, int saltlen,
-                                 unsigned char *aiv, int prf_nid,
-                                 OSSL_LIB_CTX *libctx);
+    unsigned char *salt, int saltlen,
+    unsigned char *aiv, int prf_nid,
+    OSSL_LIB_CTX *libctx);
 
 #ifndef OPENSSL_NO_SCRYPT
 X509_ALGOR *PKCS5_pbe2_set_scrypt(const EVP_CIPHER *cipher,
-                                  const unsigned char *salt, int saltlen,
-                                  unsigned char *aiv, uint64_t N, uint64_t r,
-                                  uint64_t p);
+    const unsigned char *salt, int saltlen,
+    unsigned char *aiv, uint64_t N, uint64_t r,
+    uint64_t p);
 #endif
 
 X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
-                             int prf_nid, int keylen);
+    int prf_nid, int keylen);
 X509_ALGOR *PKCS5_pbkdf2_set_ex(int iter, unsigned char *salt, int saltlen,
-                                int prf_nid, int keylen,
-                                OSSL_LIB_CTX *libctx);
+    int prf_nid, int keylen,
+    OSSL_LIB_CTX *libctx);
 
 PBKDF2PARAM *PBMAC1_get1_pbkdf2_param(const X509_ALGOR *macalg);
 /* PKCS#8 utilities */
@@ -1074,36 +1073,35 @@ DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
 
 EVP_PKEY *EVP_PKCS82PKEY(const PKCS8_PRIV_KEY_INFO *p8);
 EVP_PKEY *EVP_PKCS82PKEY_ex(const PKCS8_PRIV_KEY_INFO *p8, OSSL_LIB_CTX *libctx,
-                            const char *propq);
+    const char *propq);
 PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(const EVP_PKEY *pkey);
 
 int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
-                    int version, int ptype, void *pval,
-                    unsigned char *penc, int penclen);
+    int version, int ptype, void *pval,
+    unsigned char *penc, int penclen);
 int PKCS8_pkey_get0(const ASN1_OBJECT **ppkalg,
-                    const unsigned char **pk, int *ppklen,
-                    const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8);
+    const unsigned char **pk, int *ppklen,
+    const X509_ALGOR **pa, const PKCS8_PRIV_KEY_INFO *p8);
 
 const STACK_OF(X509_ATTRIBUTE) *
 PKCS8_pkey_get0_attrs(const PKCS8_PRIV_KEY_INFO *p8);
 int PKCS8_pkey_add1_attr(PKCS8_PRIV_KEY_INFO *p8, X509_ATTRIBUTE *attr);
 int PKCS8_pkey_add1_attr_by_NID(PKCS8_PRIV_KEY_INFO *p8, int nid, int type,
-                                const unsigned char *bytes, int len);
+    const unsigned char *bytes, int len);
 int PKCS8_pkey_add1_attr_by_OBJ(PKCS8_PRIV_KEY_INFO *p8, const ASN1_OBJECT *obj,
-                                int type, const unsigned char *bytes, int len);
-
+    int type, const unsigned char *bytes, int len);
 
 void X509_PUBKEY_set0_public_key(X509_PUBKEY *pub,
-                                 unsigned char *penc, int penclen);
+    unsigned char *penc, int penclen);
 int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
-                           int ptype, void *pval,
-                           unsigned char *penc, int penclen);
+    int ptype, void *pval,
+    unsigned char *penc, int penclen);
 int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg,
-                           const unsigned char **pk, int *ppklen,
-                           X509_ALGOR **pa, const X509_PUBKEY *pub);
+    const unsigned char **pk, int *ppklen,
+    X509_ALGOR **pa, const X509_PUBKEY *pub);
 int X509_PUBKEY_eq(const X509_PUBKEY *a, const X509_PUBKEY *b);
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/x509_acert.h.in b/include/openssl/x509_acert.h.in
index bf4395eec6aa..e136de04dcfe 100644
--- a/include/openssl/x509_acert.h.in
+++ b/include/openssl/x509_acert.h.in
@@ -9,17 +9,19 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_X509_ACERT_H
-# define OPENSSL_X509_ACERT_H
-# pragma once
+#define OPENSSL_X509_ACERT_H
+#pragma once
 
-# include <openssl/x509v3.h>
-# include <openssl/x509.h>
-# include <openssl/pem.h>
+#include <openssl/x509v3.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 typedef struct X509_acert_st X509_ACERT;
 typedef struct X509_acert_info_st X509_ACERT_INFO;
@@ -35,10 +37,10 @@ DECLARE_ASN1_ALLOC_FUNCTIONS(OSSL_OBJECT_DIGEST_INFO)
 DECLARE_ASN1_ALLOC_FUNCTIONS(OSSL_ISSUER_SERIAL)
 DECLARE_ASN1_ALLOC_FUNCTIONS(X509_ACERT_ISSUER_V2FORM)
 
-# ifndef OPENSSL_NO_STDIO
+#ifndef OPENSSL_NO_STDIO
 X509_ACERT *d2i_X509_ACERT_fp(FILE *fp, X509_ACERT **acert);
 int i2d_X509_ACERT_fp(FILE *fp, const X509_ACERT *acert);
-# endif
+#endif
 
 DECLARE_PEM_rw(X509_ACERT, X509_ACERT)
 
@@ -49,16 +51,16 @@ int X509_ACERT_sign(X509_ACERT *x, EVP_PKEY *pkey, const EVP_MD *md);
 int X509_ACERT_sign_ctx(X509_ACERT *x, EVP_MD_CTX *ctx);
 int X509_ACERT_verify(X509_ACERT *a, EVP_PKEY *r);
 
-# define X509_ACERT_VERSION_2 1
+#define X509_ACERT_VERSION_2 1
 
 const GENERAL_NAMES *X509_ACERT_get0_holder_entityName(const X509_ACERT *x);
 const OSSL_ISSUER_SERIAL *X509_ACERT_get0_holder_baseCertId(const X509_ACERT *x);
-const OSSL_OBJECT_DIGEST_INFO * X509_ACERT_get0_holder_digest(const X509_ACERT *x);
+const OSSL_OBJECT_DIGEST_INFO *X509_ACERT_get0_holder_digest(const X509_ACERT *x);
 const X509_NAME *X509_ACERT_get0_issuerName(const X509_ACERT *x);
 long X509_ACERT_get_version(const X509_ACERT *x);
 void X509_ACERT_get0_signature(const X509_ACERT *x,
-                               const ASN1_BIT_STRING **psig,
-                               const X509_ALGOR **palg);
+    const ASN1_BIT_STRING **psig,
+    const X509_ALGOR **palg);
 int X509_ACERT_get_signature_nid(const X509_ACERT *x);
 const X509_ALGOR *X509_ACERT_get0_info_sigalg(const X509_ACERT *x);
 const ASN1_INTEGER *X509_ACERT_get0_serialNumber(const X509_ACERT *x);
@@ -68,38 +70,38 @@ const ASN1_BIT_STRING *X509_ACERT_get0_issuerUID(const X509_ACERT *x);
 
 int X509_ACERT_print(BIO *bp, X509_ACERT *x);
 int X509_ACERT_print_ex(BIO *bp, X509_ACERT *x, unsigned long nmflags,
-                        unsigned long cflag);
+    unsigned long cflag);
 
 int X509_ACERT_get_attr_count(const X509_ACERT *x);
 int X509_ACERT_get_attr_by_NID(const X509_ACERT *x, int nid, int lastpos);
 int X509_ACERT_get_attr_by_OBJ(const X509_ACERT *x, const ASN1_OBJECT *obj,
-                               int lastpos);
+    int lastpos);
 X509_ATTRIBUTE *X509_ACERT_get_attr(const X509_ACERT *x, int loc);
 X509_ATTRIBUTE *X509_ACERT_delete_attr(X509_ACERT *x, int loc);
 
 void *X509_ACERT_get_ext_d2i(const X509_ACERT *x, int nid, int *crit, int *idx);
 int X509_ACERT_add1_ext_i2d(X509_ACERT *x, int nid, void *value, int crit,
-                            unsigned long flags);
+    unsigned long flags);
 const STACK_OF(X509_EXTENSION) *X509_ACERT_get0_extensions(const X509_ACERT *x);
 
-# define OSSL_OBJECT_DIGEST_INFO_PUBLIC_KEY        0
-# define OSSL_OBJECT_DIGEST_INFO_PUBLIC_KEY_CERT   1
-# define OSSL_OBJECT_DIGEST_INFO_OTHER             2  /* must not be used in RFC 5755 profile */
+#define OSSL_OBJECT_DIGEST_INFO_PUBLIC_KEY 0
+#define OSSL_OBJECT_DIGEST_INFO_PUBLIC_KEY_CERT 1
+#define OSSL_OBJECT_DIGEST_INFO_OTHER 2 /* must not be used in RFC 5755 profile */
 int X509_ACERT_set_version(X509_ACERT *x, long version);
 void X509_ACERT_set0_holder_entityName(X509_ACERT *x, GENERAL_NAMES *name);
 void X509_ACERT_set0_holder_baseCertId(X509_ACERT *x, OSSL_ISSUER_SERIAL *isss);
 void X509_ACERT_set0_holder_digest(X509_ACERT *x,
-                                   OSSL_OBJECT_DIGEST_INFO *dinfo);
+    OSSL_OBJECT_DIGEST_INFO *dinfo);
 
 int X509_ACERT_add1_attr(X509_ACERT *x, X509_ATTRIBUTE *attr);
 int X509_ACERT_add1_attr_by_OBJ(X509_ACERT *x, const ASN1_OBJECT *obj,
-                                int type, const void *bytes, int len);
+    int type, const void *bytes, int len);
 int X509_ACERT_add1_attr_by_NID(X509_ACERT *x, int nid, int type,
-                                const void *bytes, int len);
+    const void *bytes, int len);
 int X509_ACERT_add1_attr_by_txt(X509_ACERT *x, const char *attrname, int type,
-                                const unsigned char *bytes, int len);
+    const unsigned char *bytes, int len);
 int X509_ACERT_add_attr_nconf(CONF *conf, const char *section,
-                              X509_ACERT *acert);
+    X509_ACERT *acert);
 
 int X509_ACERT_set1_issuerName(X509_ACERT *x, const X509_NAME *name);
 int X509_ACERT_set1_serialNumber(X509_ACERT *x, const ASN1_INTEGER *serial);
@@ -107,35 +109,37 @@ int X509_ACERT_set1_notBefore(X509_ACERT *x, const ASN1_GENERALIZEDTIME *time);
 int X509_ACERT_set1_notAfter(X509_ACERT *x, const ASN1_GENERALIZEDTIME *time);
 
 void OSSL_OBJECT_DIGEST_INFO_get0_digest(const OSSL_OBJECT_DIGEST_INFO *o,
-                                         int *digestedObjectType,
-                                         const X509_ALGOR **digestAlgorithm,
-                                         const ASN1_BIT_STRING **digest);
+    int *digestedObjectType,
+    const X509_ALGOR **digestAlgorithm,
+    const ASN1_BIT_STRING **digest);
 
 int OSSL_OBJECT_DIGEST_INFO_set1_digest(OSSL_OBJECT_DIGEST_INFO *o,
-                                        int digestedObjectType,
-                                        X509_ALGOR *digestAlgorithm,
-                                        ASN1_BIT_STRING *digest);
+    int digestedObjectType,
+    X509_ALGOR *digestAlgorithm,
+    ASN1_BIT_STRING *digest);
 
 const X509_NAME *OSSL_ISSUER_SERIAL_get0_issuer(const OSSL_ISSUER_SERIAL *isss);
 const ASN1_INTEGER *OSSL_ISSUER_SERIAL_get0_serial(const OSSL_ISSUER_SERIAL *isss);
 const ASN1_BIT_STRING *OSSL_ISSUER_SERIAL_get0_issuerUID(const OSSL_ISSUER_SERIAL *isss);
 
 int OSSL_ISSUER_SERIAL_set1_issuer(OSSL_ISSUER_SERIAL *isss,
-                                   const X509_NAME *issuer);
+    const X509_NAME *issuer);
 int OSSL_ISSUER_SERIAL_set1_serial(OSSL_ISSUER_SERIAL *isss,
-                                   const ASN1_INTEGER *serial);
+    const ASN1_INTEGER *serial);
 int OSSL_ISSUER_SERIAL_set1_issuerUID(OSSL_ISSUER_SERIAL *isss,
-                                   const ASN1_BIT_STRING *uid);
+    const ASN1_BIT_STRING *uid);
 
-# define OSSL_IETFAS_OCTETS     0
-# define OSSL_IETFAS_OID        1
-# define OSSL_IETFAS_STRING     2
+#define OSSL_IETFAS_OCTETS 0
+#define OSSL_IETFAS_OID 1
+#define OSSL_IETFAS_STRING 2
 
 typedef struct OSSL_IETF_ATTR_SYNTAX_VALUE_st OSSL_IETF_ATTR_SYNTAX_VALUE;
 typedef struct OSSL_IETF_ATTR_SYNTAX_st OSSL_IETF_ATTR_SYNTAX;
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_IETF_ATTR_SYNTAX_VALUE");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_ITEM(OSSL_IETF_ATTR_SYNTAX_VALUE)
 DECLARE_ASN1_ALLOC_FUNCTIONS(OSSL_IETF_ATTR_SYNTAX_VALUE)
@@ -144,13 +148,13 @@ DECLARE_ASN1_FUNCTIONS(OSSL_IETF_ATTR_SYNTAX)
 const GENERAL_NAMES *
 OSSL_IETF_ATTR_SYNTAX_get0_policyAuthority(const OSSL_IETF_ATTR_SYNTAX *a);
 void OSSL_IETF_ATTR_SYNTAX_set0_policyAuthority(OSSL_IETF_ATTR_SYNTAX *a,
-		                                        GENERAL_NAMES *names);
+    GENERAL_NAMES *names);
 
 int OSSL_IETF_ATTR_SYNTAX_get_value_num(const OSSL_IETF_ATTR_SYNTAX *a);
 void *OSSL_IETF_ATTR_SYNTAX_get0_value(const OSSL_IETF_ATTR_SYNTAX *a,
-		                               int ind, int *type);
+    int ind, int *type);
 int OSSL_IETF_ATTR_SYNTAX_add1_value(OSSL_IETF_ATTR_SYNTAX *a, int type,
-		                             void *data);
+    void *data);
 int OSSL_IETF_ATTR_SYNTAX_print(BIO *bp, OSSL_IETF_ATTR_SYNTAX *a, int indent);
 
 struct TARGET_CERT_st {
@@ -161,9 +165,9 @@ struct TARGET_CERT_st {
 
 typedef struct TARGET_CERT_st OSSL_TARGET_CERT;
 
-# define OSSL_TGT_TARGET_NAME  0
-# define OSSL_TGT_TARGET_GROUP 1
-# define OSSL_TGT_TARGET_CERT  2
+#define OSSL_TGT_TARGET_NAME 0
+#define OSSL_TGT_TARGET_GROUP 1
+#define OSSL_TGT_TARGET_CERT 2
 
 typedef struct TARGET_st {
     int type;
@@ -177,13 +181,17 @@ typedef struct TARGET_st {
 typedef STACK_OF(OSSL_TARGET) OSSL_TARGETS;
 typedef STACK_OF(OSSL_TARGETS) OSSL_TARGETING_INFORMATION;
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_TARGET");
 -}
+/* clang-format on */
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_TARGETS");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_FUNCTIONS(OSSL_TARGET)
 DECLARE_ASN1_FUNCTIONS(OSSL_TARGETS)
@@ -192,8 +200,10 @@ DECLARE_ASN1_FUNCTIONS(OSSL_TARGETING_INFORMATION)
 typedef STACK_OF(OSSL_ISSUER_SERIAL) OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX;
 DECLARE_ASN1_FUNCTIONS(OSSL_AUTHORITY_ATTRIBUTE_ID_SYNTAX)
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_ISSUER_SERIAL");
 -}
+/* clang-format on */
 
 #endif
diff --git a/include/openssl/x509_vfy.h.in b/include/openssl/x509_vfy.h.in
index 2a402f216137..ce9d7bb9b1de 100644
--- a/include/openssl/x509_vfy.h.in
+++ b/include/openssl/x509_vfy.h.in
@@ -9,33 +9,35 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_X509_VFY_H
-# define OPENSSL_X509_VFY_H
-# pragma once
+#define OPENSSL_X509_VFY_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_X509_VFY_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_X509_VFY_H
+#endif
 
 /*
  * Protect against recursion, x509.h and x509_vfy.h each include the other.
  */
-# ifndef OPENSSL_X509_H
-#  include <openssl/x509.h>
-# endif
+#ifndef OPENSSL_X509_H
+#include <openssl/x509.h>
+#endif
 
-# include <openssl/opensslconf.h>
-# include <openssl/lhash.h>
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/symhacks.h>
+#include <openssl/opensslconf.h>
+#include <openssl/lhash.h>
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/symhacks.h>
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
@@ -58,68 +60,73 @@ certificate chain.
 
 typedef enum {
     X509_LU_NONE = 0,
-    X509_LU_X509, X509_LU_CRL
+    X509_LU_X509,
+    X509_LU_CRL
 } X509_LOOKUP_TYPE;
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#define X509_LU_RETRY   -1
-#define X509_LU_FAIL    0
+#define X509_LU_RETRY -1
+#define X509_LU_FAIL 0
 #endif
 
+/* clang-format off */
 {-
     generate_stack_macros("X509_LOOKUP")
     .generate_stack_macros("X509_OBJECT")
     .generate_stack_macros("X509_VERIFY_PARAM");
 -}
+/* clang-format on */
 
 /* This is used for a table of trust checking functions */
 typedef struct x509_trust_st {
     int trust;
     int flags;
-    int (*check_trust) (struct x509_trust_st *, X509 *, int);
+    int (*check_trust)(struct x509_trust_st *, X509 *, int);
     char *name;
     int arg1;
     void *arg2;
 } X509_TRUST;
+/* clang-format off */
 {-
     generate_stack_macros("X509_TRUST");
 -}
+/* clang-format on */
 
 /* standard trust ids */
-# define X509_TRUST_DEFAULT      0 /* Only valid in purpose settings */
-# define X509_TRUST_COMPAT       1
-# define X509_TRUST_SSL_CLIENT   2
-# define X509_TRUST_SSL_SERVER   3
-# define X509_TRUST_EMAIL        4
-# define X509_TRUST_OBJECT_SIGN  5
-# define X509_TRUST_OCSP_SIGN    6
-# define X509_TRUST_OCSP_REQUEST 7
-# define X509_TRUST_TSA          8
+#define X509_TRUST_DEFAULT 0 /* Only valid in purpose settings */
+#define X509_TRUST_COMPAT 1
+#define X509_TRUST_SSL_CLIENT 2
+#define X509_TRUST_SSL_SERVER 3
+#define X509_TRUST_EMAIL 4
+#define X509_TRUST_OBJECT_SIGN 5
+#define X509_TRUST_OCSP_SIGN 6
+#define X509_TRUST_OCSP_REQUEST 7
+#define X509_TRUST_TSA 8
 /* Keep these up to date! */
-# define X509_TRUST_MIN          1
-# define X509_TRUST_MAX          8
+#define X509_TRUST_MIN 1
+#define X509_TRUST_MAX 8
 
 /* trust_flags values */
-# define X509_TRUST_DYNAMIC      (1U << 0)
-# define X509_TRUST_DYNAMIC_NAME (1U << 1)
+#define X509_TRUST_DYNAMIC (1U << 0)
+#define X509_TRUST_DYNAMIC_NAME (1U << 1)
 /* No compat trust if self-signed, preempts "DO_SS" */
-# define X509_TRUST_NO_SS_COMPAT (1U << 2)
+#define X509_TRUST_NO_SS_COMPAT (1U << 2)
 /* Compat trust if no explicit accepted trust EKUs */
-# define X509_TRUST_DO_SS_COMPAT (1U << 3)
+#define X509_TRUST_DO_SS_COMPAT (1U << 3)
 /* Accept "anyEKU" as a wildcard rejection OID and as a wildcard trust OID */
-# define X509_TRUST_OK_ANY_EKU   (1U << 4)
+#define X509_TRUST_OK_ANY_EKU (1U << 4)
 
 /* check_trust return codes */
-# define X509_TRUST_TRUSTED      1
-# define X509_TRUST_REJECTED     2
-# define X509_TRUST_UNTRUSTED    3
+#define X509_TRUST_TRUSTED 1
+#define X509_TRUST_REJECTED 2
+#define X509_TRUST_UNTRUSTED 3
 
 int X509_TRUST_set(int *t, int trust);
 int X509_TRUST_get_count(void);
 X509_TRUST *X509_TRUST_get0(int idx);
 int X509_TRUST_get_by_id(int id);
-int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
-                   const char *name, int arg1, void *arg2);
+int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
+    const char *name, int arg1, void *arg2);
 void X509_TRUST_cleanup(void);
 int X509_TRUST_get_flags(const X509_TRUST *xp);
 char *X509_TRUST_get0_name(const X509_TRUST *xp);
@@ -133,15 +140,15 @@ void X509_reject_clear(X509 *x);
 STACK_OF(ASN1_OBJECT) *X509_get0_trust_objects(X509 *x);
 STACK_OF(ASN1_OBJECT) *X509_get0_reject_objects(X509 *x);
 
-int (*X509_TRUST_set_default(int (*trust) (int, X509 *, int))) (int, X509 *,
-                                                                int);
+int (*X509_TRUST_set_default(int (*trust)(int, X509 *, int)))(int, X509 *,
+    int);
 int X509_check_trust(X509 *x, int id, int flags);
 
 int X509_verify_cert(X509_STORE_CTX *ctx);
 int X509_STORE_CTX_verify(X509_STORE_CTX *ctx);
 STACK_OF(X509) *X509_build_chain(X509 *target, STACK_OF(X509) *certs,
-                                 X509_STORE *store, int with_self_signed,
-                                 OSSL_LIB_CTX *libctx, const char *propq);
+    X509_STORE *store, int with_self_signed,
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 int X509_STORE_set_depth(X509_STORE *store, int depth);
 
@@ -149,243 +156,243 @@ typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
 int X509_STORE_CTX_print_verify_cb(int ok, X509_STORE_CTX *ctx);
 typedef int (*X509_STORE_CTX_verify_fn)(X509_STORE_CTX *);
 typedef int (*X509_STORE_CTX_get_issuer_fn)(X509 **issuer,
-                                            X509_STORE_CTX *ctx, X509 *x);
+    X509_STORE_CTX *ctx, X509 *x);
 typedef int (*X509_STORE_CTX_check_issued_fn)(X509_STORE_CTX *ctx,
-                                              X509 *x, X509 *issuer);
+    X509 *x, X509 *issuer);
 typedef int (*X509_STORE_CTX_check_revocation_fn)(X509_STORE_CTX *ctx);
 typedef int (*X509_STORE_CTX_get_crl_fn)(X509_STORE_CTX *ctx,
-                                         X509_CRL **crl, X509 *x);
+    X509_CRL **crl, X509 *x);
 typedef int (*X509_STORE_CTX_check_crl_fn)(X509_STORE_CTX *ctx, X509_CRL *crl);
 typedef int (*X509_STORE_CTX_cert_crl_fn)(X509_STORE_CTX *ctx,
-                                          X509_CRL *crl, X509 *x);
+    X509_CRL *crl, X509 *x);
 typedef int (*X509_STORE_CTX_check_policy_fn)(X509_STORE_CTX *ctx);
 typedef STACK_OF(X509)
     *(*X509_STORE_CTX_lookup_certs_fn)(X509_STORE_CTX *ctx,
-                                       const X509_NAME *nm);
+        const X509_NAME *nm);
 typedef STACK_OF(X509_CRL)
     *(*X509_STORE_CTX_lookup_crls_fn)(const X509_STORE_CTX *ctx,
-                                      const X509_NAME *nm);
+        const X509_NAME *nm);
 typedef int (*X509_STORE_CTX_cleanup_fn)(X509_STORE_CTX *ctx);
 
 void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
 
-# define X509_STORE_CTX_set_app_data(ctx,data) \
-        X509_STORE_CTX_set_ex_data(ctx,0,data)
-# define X509_STORE_CTX_get_app_data(ctx) \
-        X509_STORE_CTX_get_ex_data(ctx,0)
+#define X509_STORE_CTX_set_app_data(ctx, data) \
+    X509_STORE_CTX_set_ex_data(ctx, 0, data)
+#define X509_STORE_CTX_get_app_data(ctx) \
+    X509_STORE_CTX_get_ex_data(ctx, 0)
 
-# define X509_L_FILE_LOAD        1
-# define X509_L_ADD_DIR          2
-# define X509_L_ADD_STORE        3
-# define X509_L_LOAD_STORE       4
+#define X509_L_FILE_LOAD 1
+#define X509_L_ADD_DIR 2
+#define X509_L_ADD_STORE 3
+#define X509_L_LOAD_STORE 4
 
-# define X509_LOOKUP_load_file(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
+#define X509_LOOKUP_load_file(x, name, type) \
+    X509_LOOKUP_ctrl((x), X509_L_FILE_LOAD, (name), (long)(type), NULL)
 
-# define X509_LOOKUP_add_dir(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
+#define X509_LOOKUP_add_dir(x, name, type) \
+    X509_LOOKUP_ctrl((x), X509_L_ADD_DIR, (name), (long)(type), NULL)
 
-# define X509_LOOKUP_add_store(x,name) \
-                X509_LOOKUP_ctrl((x),X509_L_ADD_STORE,(name),0,NULL)
+#define X509_LOOKUP_add_store(x, name) \
+    X509_LOOKUP_ctrl((x), X509_L_ADD_STORE, (name), 0, NULL)
 
-# define X509_LOOKUP_load_store(x,name) \
-                X509_LOOKUP_ctrl((x),X509_L_LOAD_STORE,(name),0,NULL)
+#define X509_LOOKUP_load_store(x, name) \
+    X509_LOOKUP_ctrl((x), X509_L_LOAD_STORE, (name), 0, NULL)
 
-# define X509_LOOKUP_load_file_ex(x, name, type, libctx, propq)       \
-X509_LOOKUP_ctrl_ex((x), X509_L_FILE_LOAD, (name), (long)(type), NULL,\
-                    (libctx), (propq))
+#define X509_LOOKUP_load_file_ex(x, name, type, libctx, propq)             \
+    X509_LOOKUP_ctrl_ex((x), X509_L_FILE_LOAD, (name), (long)(type), NULL, \
+        (libctx), (propq))
 
-# define X509_LOOKUP_load_store_ex(x, name, libctx, propq)            \
-X509_LOOKUP_ctrl_ex((x), X509_L_LOAD_STORE, (name), 0, NULL,          \
-                    (libctx), (propq))
+#define X509_LOOKUP_load_store_ex(x, name, libctx, propq)        \
+    X509_LOOKUP_ctrl_ex((x), X509_L_LOAD_STORE, (name), 0, NULL, \
+        (libctx), (propq))
 
-# define X509_LOOKUP_add_store_ex(x, name, libctx, propq)             \
-X509_LOOKUP_ctrl_ex((x), X509_L_ADD_STORE, (name), 0, NULL,           \
-                    (libctx), (propq))
+#define X509_LOOKUP_add_store_ex(x, name, libctx, propq)        \
+    X509_LOOKUP_ctrl_ex((x), X509_L_ADD_STORE, (name), 0, NULL, \
+        (libctx), (propq))
 
-# define X509_V_OK                                       0
-# define X509_V_ERR_UNSPECIFIED                          1
-# define X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2
-# define X509_V_ERR_UNABLE_TO_GET_CRL                    3
-# define X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE     4
-# define X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE      5
-# define X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY   6
-# define X509_V_ERR_CERT_SIGNATURE_FAILURE               7
-# define X509_V_ERR_CRL_SIGNATURE_FAILURE                8
-# define X509_V_ERR_CERT_NOT_YET_VALID                   9
-# define X509_V_ERR_CERT_HAS_EXPIRED                     10
-# define X509_V_ERR_CRL_NOT_YET_VALID                    11
-# define X509_V_ERR_CRL_HAS_EXPIRED                      12
-# define X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD       13
-# define X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD        14
-# define X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD       15
-# define X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD       16
-# define X509_V_ERR_OUT_OF_MEM                           17
-# define X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT          18
-# define X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN            19
-# define X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY    20
-# define X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE      21
-# define X509_V_ERR_CERT_CHAIN_TOO_LONG                  22
-# define X509_V_ERR_CERT_REVOKED                         23
-# define X509_V_ERR_NO_ISSUER_PUBLIC_KEY                 24
-# define X509_V_ERR_PATH_LENGTH_EXCEEDED                 25
-# define X509_V_ERR_INVALID_PURPOSE                      26
-# define X509_V_ERR_CERT_UNTRUSTED                       27
-# define X509_V_ERR_CERT_REJECTED                        28
+#define X509_V_OK 0
+#define X509_V_ERR_UNSPECIFIED 1
+#define X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT 2
+#define X509_V_ERR_UNABLE_TO_GET_CRL 3
+#define X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE 4
+#define X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE 5
+#define X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY 6
+#define X509_V_ERR_CERT_SIGNATURE_FAILURE 7
+#define X509_V_ERR_CRL_SIGNATURE_FAILURE 8
+#define X509_V_ERR_CERT_NOT_YET_VALID 9
+#define X509_V_ERR_CERT_HAS_EXPIRED 10
+#define X509_V_ERR_CRL_NOT_YET_VALID 11
+#define X509_V_ERR_CRL_HAS_EXPIRED 12
+#define X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD 13
+#define X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD 14
+#define X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD 15
+#define X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD 16
+#define X509_V_ERR_OUT_OF_MEM 17
+#define X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT 18
+#define X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN 19
+#define X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY 20
+#define X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE 21
+#define X509_V_ERR_CERT_CHAIN_TOO_LONG 22
+#define X509_V_ERR_CERT_REVOKED 23
+#define X509_V_ERR_NO_ISSUER_PUBLIC_KEY 24
+#define X509_V_ERR_PATH_LENGTH_EXCEEDED 25
+#define X509_V_ERR_INVALID_PURPOSE 26
+#define X509_V_ERR_CERT_UNTRUSTED 27
+#define X509_V_ERR_CERT_REJECTED 28
 
 /* These are 'informational' when looking for issuer cert */
-# define X509_V_ERR_SUBJECT_ISSUER_MISMATCH              29
-# define X509_V_ERR_AKID_SKID_MISMATCH                   30
-# define X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH          31
-# define X509_V_ERR_KEYUSAGE_NO_CERTSIGN                 32
-# define X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER             33
-# define X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION         34
-# define X509_V_ERR_KEYUSAGE_NO_CRL_SIGN                 35
-# define X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION     36
-# define X509_V_ERR_INVALID_NON_CA                       37
-# define X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED           38
-# define X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE        39
-# define X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED       40
-# define X509_V_ERR_INVALID_EXTENSION                    41
-# define X509_V_ERR_INVALID_POLICY_EXTENSION             42
-# define X509_V_ERR_NO_EXPLICIT_POLICY                   43
-# define X509_V_ERR_DIFFERENT_CRL_SCOPE                  44
-# define X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE        45
-# define X509_V_ERR_UNNESTED_RESOURCE                    46
-# define X509_V_ERR_PERMITTED_VIOLATION                  47
-# define X509_V_ERR_EXCLUDED_VIOLATION                   48
-# define X509_V_ERR_SUBTREE_MINMAX                       49
+#define X509_V_ERR_SUBJECT_ISSUER_MISMATCH 29
+#define X509_V_ERR_AKID_SKID_MISMATCH 30
+#define X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH 31
+#define X509_V_ERR_KEYUSAGE_NO_CERTSIGN 32
+#define X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER 33
+#define X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION 34
+#define X509_V_ERR_KEYUSAGE_NO_CRL_SIGN 35
+#define X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION 36
+#define X509_V_ERR_INVALID_NON_CA 37
+#define X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED 38
+#define X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE 39
+#define X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED 40
+#define X509_V_ERR_INVALID_EXTENSION 41
+#define X509_V_ERR_INVALID_POLICY_EXTENSION 42
+#define X509_V_ERR_NO_EXPLICIT_POLICY 43
+#define X509_V_ERR_DIFFERENT_CRL_SCOPE 44
+#define X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE 45
+#define X509_V_ERR_UNNESTED_RESOURCE 46
+#define X509_V_ERR_PERMITTED_VIOLATION 47
+#define X509_V_ERR_EXCLUDED_VIOLATION 48
+#define X509_V_ERR_SUBTREE_MINMAX 49
 /* The application is not happy */
-# define X509_V_ERR_APPLICATION_VERIFICATION             50
-# define X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE          51
-# define X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX        52
-# define X509_V_ERR_UNSUPPORTED_NAME_SYNTAX              53
-# define X509_V_ERR_CRL_PATH_VALIDATION_ERROR            54
+#define X509_V_ERR_APPLICATION_VERIFICATION 50
+#define X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE 51
+#define X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX 52
+#define X509_V_ERR_UNSUPPORTED_NAME_SYNTAX 53
+#define X509_V_ERR_CRL_PATH_VALIDATION_ERROR 54
 /* Another issuer check debug option */
-# define X509_V_ERR_PATH_LOOP                            55
+#define X509_V_ERR_PATH_LOOP 55
 /* Suite B mode algorithm violation */
-# define X509_V_ERR_SUITE_B_INVALID_VERSION              56
-# define X509_V_ERR_SUITE_B_INVALID_ALGORITHM            57
-# define X509_V_ERR_SUITE_B_INVALID_CURVE                58
-# define X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM  59
-# define X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED              60
-# define X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 61
+#define X509_V_ERR_SUITE_B_INVALID_VERSION 56
+#define X509_V_ERR_SUITE_B_INVALID_ALGORITHM 57
+#define X509_V_ERR_SUITE_B_INVALID_CURVE 58
+#define X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM 59
+#define X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED 60
+#define X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256 61
 /* Host, email and IP check errors */
-# define X509_V_ERR_HOSTNAME_MISMATCH                    62
-# define X509_V_ERR_EMAIL_MISMATCH                       63
-# define X509_V_ERR_IP_ADDRESS_MISMATCH                  64
+#define X509_V_ERR_HOSTNAME_MISMATCH 62
+#define X509_V_ERR_EMAIL_MISMATCH 63
+#define X509_V_ERR_IP_ADDRESS_MISMATCH 64
 /* DANE TLSA errors */
-# define X509_V_ERR_DANE_NO_MATCH                        65
+#define X509_V_ERR_DANE_NO_MATCH 65
 /* security level errors */
-# define X509_V_ERR_EE_KEY_TOO_SMALL                     66
-# define X509_V_ERR_CA_KEY_TOO_SMALL                     67
-# define X509_V_ERR_CA_MD_TOO_WEAK                       68
+#define X509_V_ERR_EE_KEY_TOO_SMALL 66
+#define X509_V_ERR_CA_KEY_TOO_SMALL 67
+#define X509_V_ERR_CA_MD_TOO_WEAK 68
 /* Caller error */
-# define X509_V_ERR_INVALID_CALL                         69
+#define X509_V_ERR_INVALID_CALL 69
 /* Issuer lookup error */
-# define X509_V_ERR_STORE_LOOKUP                         70
+#define X509_V_ERR_STORE_LOOKUP 70
 /* Certificate transparency */
-# define X509_V_ERR_NO_VALID_SCTS                        71
+#define X509_V_ERR_NO_VALID_SCTS 71
 
-# define X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION         72
+#define X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION 72
 /* OCSP status errors */
-# define X509_V_ERR_OCSP_VERIFY_NEEDED                   73  /* Need OCSP verification */
-# define X509_V_ERR_OCSP_VERIFY_FAILED                   74  /* Couldn't verify cert through OCSP */
-# define X509_V_ERR_OCSP_CERT_UNKNOWN                    75  /* Certificate wasn't recognized by the OCSP responder */
+#define X509_V_ERR_OCSP_VERIFY_NEEDED 73 /* Need OCSP verification */
+#define X509_V_ERR_OCSP_VERIFY_FAILED 74 /* Couldn't verify cert through OCSP */
+#define X509_V_ERR_OCSP_CERT_UNKNOWN 75 /* Certificate wasn't recognized by the OCSP responder */
 
-# define X509_V_ERR_UNSUPPORTED_SIGNATURE_ALGORITHM      76
-# define X509_V_ERR_SIGNATURE_ALGORITHM_MISMATCH         77
+#define X509_V_ERR_UNSUPPORTED_SIGNATURE_ALGORITHM 76
+#define X509_V_ERR_SIGNATURE_ALGORITHM_MISMATCH 77
 
 /* Errors in case a check in X509_V_FLAG_X509_STRICT mode fails */
-# define X509_V_ERR_SIGNATURE_ALGORITHM_INCONSISTENCY    78
-# define X509_V_ERR_INVALID_CA                           79
-# define X509_V_ERR_PATHLEN_INVALID_FOR_NON_CA           80
-# define X509_V_ERR_PATHLEN_WITHOUT_KU_KEY_CERT_SIGN     81
-# define X509_V_ERR_KU_KEY_CERT_SIGN_INVALID_FOR_NON_CA  82
-# define X509_V_ERR_ISSUER_NAME_EMPTY                    83
-# define X509_V_ERR_SUBJECT_NAME_EMPTY                   84
-# define X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER     85
-# define X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER       86
-# define X509_V_ERR_EMPTY_SUBJECT_ALT_NAME               87
-# define X509_V_ERR_EMPTY_SUBJECT_SAN_NOT_CRITICAL       88
-# define X509_V_ERR_CA_BCONS_NOT_CRITICAL                89
-# define X509_V_ERR_AUTHORITY_KEY_IDENTIFIER_CRITICAL    90
-# define X509_V_ERR_SUBJECT_KEY_IDENTIFIER_CRITICAL      91
-# define X509_V_ERR_CA_CERT_MISSING_KEY_USAGE            92
-# define X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3         93
-# define X509_V_ERR_EC_KEY_EXPLICIT_PARAMS               94
-# define X509_V_ERR_RPK_UNTRUSTED                        95
+#define X509_V_ERR_SIGNATURE_ALGORITHM_INCONSISTENCY 78
+#define X509_V_ERR_INVALID_CA 79
+#define X509_V_ERR_PATHLEN_INVALID_FOR_NON_CA 80
+#define X509_V_ERR_PATHLEN_WITHOUT_KU_KEY_CERT_SIGN 81
+#define X509_V_ERR_KU_KEY_CERT_SIGN_INVALID_FOR_NON_CA 82
+#define X509_V_ERR_ISSUER_NAME_EMPTY 83
+#define X509_V_ERR_SUBJECT_NAME_EMPTY 84
+#define X509_V_ERR_MISSING_AUTHORITY_KEY_IDENTIFIER 85
+#define X509_V_ERR_MISSING_SUBJECT_KEY_IDENTIFIER 86
+#define X509_V_ERR_EMPTY_SUBJECT_ALT_NAME 87
+#define X509_V_ERR_EMPTY_SUBJECT_SAN_NOT_CRITICAL 88
+#define X509_V_ERR_CA_BCONS_NOT_CRITICAL 89
+#define X509_V_ERR_AUTHORITY_KEY_IDENTIFIER_CRITICAL 90
+#define X509_V_ERR_SUBJECT_KEY_IDENTIFIER_CRITICAL 91
+#define X509_V_ERR_CA_CERT_MISSING_KEY_USAGE 92
+#define X509_V_ERR_EXTENSIONS_REQUIRE_VERSION_3 93
+#define X509_V_ERR_EC_KEY_EXPLICIT_PARAMS 94
+#define X509_V_ERR_RPK_UNTRUSTED 95
 
 /* Certificate verify flags */
-# ifndef OPENSSL_NO_DEPRECATED_1_1_0
-#  define X509_V_FLAG_CB_ISSUER_CHECK             0x0   /* Deprecated */
-# endif
+#ifndef OPENSSL_NO_DEPRECATED_1_1_0
+#define X509_V_FLAG_CB_ISSUER_CHECK 0x0 /* Deprecated */
+#endif
 /* Use check time instead of current time */
-# define X509_V_FLAG_USE_CHECK_TIME              0x2
+#define X509_V_FLAG_USE_CHECK_TIME 0x2
 /* Lookup CRLs */
-# define X509_V_FLAG_CRL_CHECK                   0x4
+#define X509_V_FLAG_CRL_CHECK 0x4
 /* Lookup CRLs for whole chain */
-# define X509_V_FLAG_CRL_CHECK_ALL               0x8
+#define X509_V_FLAG_CRL_CHECK_ALL 0x8
 /* Ignore unhandled critical extensions */
-# define X509_V_FLAG_IGNORE_CRITICAL             0x10
+#define X509_V_FLAG_IGNORE_CRITICAL 0x10
 /* Disable workarounds for broken certificates */
-# define X509_V_FLAG_X509_STRICT                 0x20
+#define X509_V_FLAG_X509_STRICT 0x20
 /* Enable proxy certificate validation */
-# define X509_V_FLAG_ALLOW_PROXY_CERTS           0x40
+#define X509_V_FLAG_ALLOW_PROXY_CERTS 0x40
 /* Enable policy checking */
-# define X509_V_FLAG_POLICY_CHECK                0x80
+#define X509_V_FLAG_POLICY_CHECK 0x80
 /* Policy variable require-explicit-policy */
-# define X509_V_FLAG_EXPLICIT_POLICY             0x100
+#define X509_V_FLAG_EXPLICIT_POLICY 0x100
 /* Policy variable inhibit-any-policy */
-# define X509_V_FLAG_INHIBIT_ANY                 0x200
+#define X509_V_FLAG_INHIBIT_ANY 0x200
 /* Policy variable inhibit-policy-mapping */
-# define X509_V_FLAG_INHIBIT_MAP                 0x400
+#define X509_V_FLAG_INHIBIT_MAP 0x400
 /* Notify callback that policy is OK */
-# define X509_V_FLAG_NOTIFY_POLICY               0x800
+#define X509_V_FLAG_NOTIFY_POLICY 0x800
 /* Extended CRL features such as indirect CRLs, alternate CRL signing keys */
-# define X509_V_FLAG_EXTENDED_CRL_SUPPORT        0x1000
+#define X509_V_FLAG_EXTENDED_CRL_SUPPORT 0x1000
 /* Delta CRL support */
-# define X509_V_FLAG_USE_DELTAS                  0x2000
+#define X509_V_FLAG_USE_DELTAS 0x2000
 /* Check self-signed CA signature */
-# define X509_V_FLAG_CHECK_SS_SIGNATURE          0x4000
+#define X509_V_FLAG_CHECK_SS_SIGNATURE 0x4000
 /* Use trusted store first */
-# define X509_V_FLAG_TRUSTED_FIRST               0x8000
+#define X509_V_FLAG_TRUSTED_FIRST 0x8000
 /* Suite B 128 bit only mode: not normally used */
-# define X509_V_FLAG_SUITEB_128_LOS_ONLY         0x10000
+#define X509_V_FLAG_SUITEB_128_LOS_ONLY 0x10000
 /* Suite B 192 bit only mode */
-# define X509_V_FLAG_SUITEB_192_LOS              0x20000
+#define X509_V_FLAG_SUITEB_192_LOS 0x20000
 /* Suite B 128 bit mode allowing 192 bit algorithms */
-# define X509_V_FLAG_SUITEB_128_LOS              0x30000
+#define X509_V_FLAG_SUITEB_128_LOS 0x30000
 /* Allow partial chains if at least one certificate is in trusted store */
-# define X509_V_FLAG_PARTIAL_CHAIN               0x80000
+#define X509_V_FLAG_PARTIAL_CHAIN 0x80000
 /*
  * If the initial chain is not trusted, do not attempt to build an alternative
  * chain. Alternate chain checking was introduced in 1.1.0. Setting this flag
  * will force the behaviour to match that of previous versions.
  */
-# define X509_V_FLAG_NO_ALT_CHAINS               0x100000
+#define X509_V_FLAG_NO_ALT_CHAINS 0x100000
 /* Do not check certificate/CRL validity against current time */
-# define X509_V_FLAG_NO_CHECK_TIME               0x200000
+#define X509_V_FLAG_NO_CHECK_TIME 0x200000
 
-# define X509_VP_FLAG_DEFAULT                    0x1
-# define X509_VP_FLAG_OVERWRITE                  0x2
-# define X509_VP_FLAG_RESET_FLAGS                0x4
-# define X509_VP_FLAG_LOCKED                     0x8
-# define X509_VP_FLAG_ONCE                       0x10
+#define X509_VP_FLAG_DEFAULT 0x1
+#define X509_VP_FLAG_OVERWRITE 0x2
+#define X509_VP_FLAG_RESET_FLAGS 0x4
+#define X509_VP_FLAG_LOCKED 0x8
+#define X509_VP_FLAG_ONCE 0x10
 
 /* Internal use: mask of policy related options */
-# define X509_V_FLAG_POLICY_MASK (X509_V_FLAG_POLICY_CHECK \
-                                | X509_V_FLAG_EXPLICIT_POLICY \
-                                | X509_V_FLAG_INHIBIT_ANY \
-                                | X509_V_FLAG_INHIBIT_MAP)
+#define X509_V_FLAG_POLICY_MASK (X509_V_FLAG_POLICY_CHECK \
+    | X509_V_FLAG_EXPLICIT_POLICY                         \
+    | X509_V_FLAG_INHIBIT_ANY                             \
+    | X509_V_FLAG_INHIBIT_MAP)
 
 int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, X509_LOOKUP_TYPE type,
-                               const X509_NAME *name);
+    const X509_NAME *name);
 X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
-                                             X509_LOOKUP_TYPE type,
-                                             const X509_NAME *name);
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name);
 X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
-                                        X509_OBJECT *x);
+    X509_OBJECT *x);
 int X509_OBJECT_up_ref_count(X509_OBJECT *a);
 X509_OBJECT *X509_OBJECT_new(void);
 void X509_OBJECT_free(X509_OBJECT *a);
@@ -403,9 +410,9 @@ STACK_OF(X509_OBJECT) *X509_STORE_get0_objects(const X509_STORE *xs);
 STACK_OF(X509_OBJECT) *X509_STORE_get1_objects(X509_STORE *xs);
 STACK_OF(X509) *X509_STORE_get1_all_certs(X509_STORE *xs);
 STACK_OF(X509) *X509_STORE_CTX_get1_certs(X509_STORE_CTX *xs,
-                                          const X509_NAME *nm);
+    const X509_NAME *nm);
 STACK_OF(X509_CRL) *X509_STORE_CTX_get1_crls(const X509_STORE_CTX *st,
-                                             const X509_NAME *nm);
+    const X509_NAME *nm);
 int X509_STORE_set_flags(X509_STORE *xs, unsigned long flags);
 int X509_STORE_set_purpose(X509_STORE *xs, int purpose);
 int X509_STORE_set_trust(X509_STORE *xs, int trust);
@@ -414,47 +421,47 @@ X509_VERIFY_PARAM *X509_STORE_get0_param(const X509_STORE *xs);
 
 void X509_STORE_set_verify(X509_STORE *xs, X509_STORE_CTX_verify_fn verify);
 #define X509_STORE_set_verify_func(ctx, func) \
-            X509_STORE_set_verify((ctx),(func))
+    X509_STORE_set_verify((ctx), (func))
 void X509_STORE_CTX_set_verify(X509_STORE_CTX *ctx,
-                               X509_STORE_CTX_verify_fn verify);
+    X509_STORE_CTX_verify_fn verify);
 X509_STORE_CTX_verify_fn X509_STORE_get_verify(const X509_STORE *xs);
 void X509_STORE_set_verify_cb(X509_STORE *xs,
-                              X509_STORE_CTX_verify_cb verify_cb);
-# define X509_STORE_set_verify_cb_func(ctx,func) \
-            X509_STORE_set_verify_cb((ctx),(func))
+    X509_STORE_CTX_verify_cb verify_cb);
+#define X509_STORE_set_verify_cb_func(ctx, func) \
+    X509_STORE_set_verify_cb((ctx), (func))
 X509_STORE_CTX_verify_cb X509_STORE_get_verify_cb(const X509_STORE *xs);
 void X509_STORE_set_get_issuer(X509_STORE *xs,
-                               X509_STORE_CTX_get_issuer_fn get_issuer);
+    X509_STORE_CTX_get_issuer_fn get_issuer);
 X509_STORE_CTX_get_issuer_fn X509_STORE_get_get_issuer(const X509_STORE *xs);
 void X509_STORE_set_check_issued(X509_STORE *xs,
-                                 X509_STORE_CTX_check_issued_fn check_issued);
+    X509_STORE_CTX_check_issued_fn check_issued);
 X509_STORE_CTX_check_issued_fn X509_STORE_get_check_issued(const X509_STORE *s);
 void X509_STORE_set_check_revocation(X509_STORE *xs,
-                                     X509_STORE_CTX_check_revocation_fn check_revocation);
+    X509_STORE_CTX_check_revocation_fn check_revocation);
 X509_STORE_CTX_check_revocation_fn
-    X509_STORE_get_check_revocation(const X509_STORE *xs);
+X509_STORE_get_check_revocation(const X509_STORE *xs);
 void X509_STORE_set_get_crl(X509_STORE *xs,
-                            X509_STORE_CTX_get_crl_fn get_crl);
+    X509_STORE_CTX_get_crl_fn get_crl);
 X509_STORE_CTX_get_crl_fn X509_STORE_get_get_crl(const X509_STORE *xs);
 void X509_STORE_set_check_crl(X509_STORE *xs,
-                              X509_STORE_CTX_check_crl_fn check_crl);
+    X509_STORE_CTX_check_crl_fn check_crl);
 X509_STORE_CTX_check_crl_fn X509_STORE_get_check_crl(const X509_STORE *xs);
 void X509_STORE_set_cert_crl(X509_STORE *xs,
-                             X509_STORE_CTX_cert_crl_fn cert_crl);
+    X509_STORE_CTX_cert_crl_fn cert_crl);
 X509_STORE_CTX_cert_crl_fn X509_STORE_get_cert_crl(const X509_STORE *xs);
 void X509_STORE_set_check_policy(X509_STORE *xs,
-                                 X509_STORE_CTX_check_policy_fn check_policy);
+    X509_STORE_CTX_check_policy_fn check_policy);
 X509_STORE_CTX_check_policy_fn X509_STORE_get_check_policy(const X509_STORE *s);
 void X509_STORE_set_lookup_certs(X509_STORE *xs,
-                                 X509_STORE_CTX_lookup_certs_fn lookup_certs);
+    X509_STORE_CTX_lookup_certs_fn lookup_certs);
 X509_STORE_CTX_lookup_certs_fn X509_STORE_get_lookup_certs(const X509_STORE *s);
 void X509_STORE_set_lookup_crls(X509_STORE *xs,
-                                X509_STORE_CTX_lookup_crls_fn lookup_crls);
+    X509_STORE_CTX_lookup_crls_fn lookup_crls);
 #define X509_STORE_set_lookup_crls_cb(ctx, func) \
     X509_STORE_set_lookup_crls((ctx), (func))
 X509_STORE_CTX_lookup_crls_fn X509_STORE_get_lookup_crls(const X509_STORE *xs);
 void X509_STORE_set_cleanup(X509_STORE *xs,
-                            X509_STORE_CTX_cleanup_fn cleanup);
+    X509_STORE_CTX_cleanup_fn cleanup);
 X509_STORE_CTX_cleanup_fn X509_STORE_get_cleanup(const X509_STORE *xs);
 
 #define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
@@ -469,26 +476,26 @@ int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
 
 void X509_STORE_CTX_free(X509_STORE_CTX *ctx);
 int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *trust_store,
-                        X509 *target, STACK_OF(X509) *untrusted);
+    X509 *target, STACK_OF(X509) *untrusted);
 int X509_STORE_CTX_init_rpk(X509_STORE_CTX *ctx, X509_STORE *trust_store,
-                            EVP_PKEY* rpk);
+    EVP_PKEY *rpk);
 void X509_STORE_CTX_set0_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
 void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);
 
 X509_STORE *X509_STORE_CTX_get0_store(const X509_STORE_CTX *ctx);
 X509 *X509_STORE_CTX_get0_cert(const X509_STORE_CTX *ctx);
 EVP_PKEY *X509_STORE_CTX_get0_rpk(const X509_STORE_CTX *ctx);
-STACK_OF(X509)* X509_STORE_CTX_get0_untrusted(const X509_STORE_CTX *ctx);
+STACK_OF(X509) *X509_STORE_CTX_get0_untrusted(const X509_STORE_CTX *ctx);
 void X509_STORE_CTX_set0_untrusted(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
 void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-                                  X509_STORE_CTX_verify_cb verify);
+    X509_STORE_CTX_verify_cb verify);
 X509_STORE_CTX_verify_cb X509_STORE_CTX_get_verify_cb(const X509_STORE_CTX *ctx);
 X509_STORE_CTX_verify_fn X509_STORE_CTX_get_verify(const X509_STORE_CTX *ctx);
 X509_STORE_CTX_get_issuer_fn X509_STORE_CTX_get_get_issuer(const X509_STORE_CTX *ctx);
 X509_STORE_CTX_check_issued_fn X509_STORE_CTX_get_check_issued(const X509_STORE_CTX *ctx);
 X509_STORE_CTX_check_revocation_fn X509_STORE_CTX_get_check_revocation(const X509_STORE_CTX *ctx);
 void X509_STORE_CTX_set_get_crl(X509_STORE_CTX *ctx,
-                                X509_STORE_CTX_get_crl_fn get_crl);
+    X509_STORE_CTX_get_crl_fn get_crl);
 X509_STORE_CTX_get_crl_fn X509_STORE_CTX_get_get_crl(const X509_STORE_CTX *ctx);
 X509_STORE_CTX_check_crl_fn X509_STORE_CTX_get_check_crl(const X509_STORE_CTX *ctx);
 X509_STORE_CTX_cert_crl_fn X509_STORE_CTX_get_cert_crl(const X509_STORE_CTX *ctx);
@@ -498,16 +505,16 @@ X509_STORE_CTX_lookup_crls_fn X509_STORE_CTX_get_lookup_crls(const X509_STORE_CT
 X509_STORE_CTX_cleanup_fn X509_STORE_CTX_get_cleanup(const X509_STORE_CTX *ctx);
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
-# define X509_STORE_CTX_get_chain X509_STORE_CTX_get0_chain
-# define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
-# define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
-# define X509_STORE_get_by_subject X509_STORE_CTX_get_by_subject
-# define X509_STORE_get1_certs X509_STORE_CTX_get1_certs
-# define X509_STORE_get1_crls X509_STORE_CTX_get1_crls
+#define X509_STORE_CTX_get_chain X509_STORE_CTX_get0_chain
+#define X509_STORE_CTX_set_chain X509_STORE_CTX_set0_untrusted
+#define X509_STORE_CTX_trusted_stack X509_STORE_CTX_set0_trusted_stack
+#define X509_STORE_get_by_subject X509_STORE_CTX_get_by_subject
+#define X509_STORE_get1_certs X509_STORE_CTX_get1_certs
+#define X509_STORE_get1_crls X509_STORE_CTX_get1_crls
 /* the following macro is misspelled; use X509_STORE_get1_certs instead */
-# define X509_STORE_get1_cert X509_STORE_CTX_get1_certs
+#define X509_STORE_get1_cert X509_STORE_CTX_get1_certs
 /* the following macro is misspelled; use X509_STORE_get1_crls instead */
-# define X509_STORE_get1_crl X509_STORE_CTX_get1_crls
+#define X509_STORE_get1_crl X509_STORE_CTX_get1_crls
 #endif
 
 X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *xs, X509_LOOKUP_METHOD *m);
@@ -516,66 +523,62 @@ X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
 X509_LOOKUP_METHOD *X509_LOOKUP_store(void);
 
 typedef int (*X509_LOOKUP_ctrl_fn)(X509_LOOKUP *ctx, int cmd, const char *argc,
-                                   long argl, char **ret);
+    long argl, char **ret);
 typedef int (*X509_LOOKUP_ctrl_ex_fn)(
     X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret,
     OSSL_LIB_CTX *libctx, const char *propq);
 
 typedef int (*X509_LOOKUP_get_by_subject_fn)(X509_LOOKUP *ctx,
-                                             X509_LOOKUP_TYPE type,
-                                             const X509_NAME *name,
-                                             X509_OBJECT *ret);
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name,
+    X509_OBJECT *ret);
 typedef int (*X509_LOOKUP_get_by_subject_ex_fn)(X509_LOOKUP *ctx,
-                                                         X509_LOOKUP_TYPE type,
-                                                         const X509_NAME *name,
-                                                         X509_OBJECT *ret,
-                                                         OSSL_LIB_CTX *libctx,
-                                                         const char *propq);
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name,
+    X509_OBJECT *ret,
+    OSSL_LIB_CTX *libctx,
+    const char *propq);
 typedef int (*X509_LOOKUP_get_by_issuer_serial_fn)(X509_LOOKUP *ctx,
-                                                   X509_LOOKUP_TYPE type,
-                                                   const X509_NAME *name,
-                                                   const ASN1_INTEGER *serial,
-                                                   X509_OBJECT *ret);
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name,
+    const ASN1_INTEGER *serial,
+    X509_OBJECT *ret);
 typedef int (*X509_LOOKUP_get_by_fingerprint_fn)(X509_LOOKUP *ctx,
-                                                 X509_LOOKUP_TYPE type,
-                                                 const unsigned char* bytes,
-                                                 int len,
-                                                 X509_OBJECT *ret);
+    X509_LOOKUP_TYPE type,
+    const unsigned char *bytes,
+    int len,
+    X509_OBJECT *ret);
 typedef int (*X509_LOOKUP_get_by_alias_fn)(X509_LOOKUP *ctx,
-                                           X509_LOOKUP_TYPE type,
-                                           const char *str,
-                                           int len,
-                                           X509_OBJECT *ret);
+    X509_LOOKUP_TYPE type,
+    const char *str,
+    int len,
+    X509_OBJECT *ret);
 
 X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name);
 void X509_LOOKUP_meth_free(X509_LOOKUP_METHOD *method);
 
 int X509_LOOKUP_meth_set_new_item(X509_LOOKUP_METHOD *method,
-                                  int (*new_item) (X509_LOOKUP *ctx));
-int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx);
+    int (*new_item)(X509_LOOKUP *ctx));
+int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx);
 
 int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method,
-                              void (*free_fn) (X509_LOOKUP *ctx));
-void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx);
+    void (*free_fn)(X509_LOOKUP *ctx));
+void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx);
 
 int X509_LOOKUP_meth_set_init(X509_LOOKUP_METHOD *method,
-                              int (*init) (X509_LOOKUP *ctx));
-int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx);
+    int (*init)(X509_LOOKUP *ctx));
+int (*X509_LOOKUP_meth_get_init(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx);
 
 int X509_LOOKUP_meth_set_shutdown(X509_LOOKUP_METHOD *method,
-                                  int (*shutdown) (X509_LOOKUP *ctx));
-int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD* method))
-    (X509_LOOKUP *ctx);
+    int (*shutdown)(X509_LOOKUP *ctx));
+int (*X509_LOOKUP_meth_get_shutdown(const X509_LOOKUP_METHOD *method))(X509_LOOKUP *ctx);
 
 int X509_LOOKUP_meth_set_ctrl(X509_LOOKUP_METHOD *method,
-                              X509_LOOKUP_ctrl_fn ctrl_fn);
+    X509_LOOKUP_ctrl_fn ctrl_fn);
 X509_LOOKUP_ctrl_fn X509_LOOKUP_meth_get_ctrl(const X509_LOOKUP_METHOD *method);
 
 int X509_LOOKUP_meth_set_get_by_subject(X509_LOOKUP_METHOD *method,
-                                        X509_LOOKUP_get_by_subject_fn fn);
+    X509_LOOKUP_get_by_subject_fn fn);
 X509_LOOKUP_get_by_subject_fn X509_LOOKUP_meth_get_get_by_subject(
     const X509_LOOKUP_METHOD *method);
 
@@ -590,51 +593,50 @@ X509_LOOKUP_get_by_fingerprint_fn X509_LOOKUP_meth_get_get_by_fingerprint(
     const X509_LOOKUP_METHOD *method);
 
 int X509_LOOKUP_meth_set_get_by_alias(X509_LOOKUP_METHOD *method,
-                                      X509_LOOKUP_get_by_alias_fn fn);
+    X509_LOOKUP_get_by_alias_fn fn);
 X509_LOOKUP_get_by_alias_fn X509_LOOKUP_meth_get_get_by_alias(
     const X509_LOOKUP_METHOD *method);
 
-
 int X509_STORE_add_cert(X509_STORE *xs, X509 *x);
 int X509_STORE_add_crl(X509_STORE *xs, X509_CRL *x);
 
 int X509_STORE_CTX_get_by_subject(const X509_STORE_CTX *vs,
-                                  X509_LOOKUP_TYPE type,
-                                  const X509_NAME *name, X509_OBJECT *ret);
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name, X509_OBJECT *ret);
 X509_OBJECT *X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *vs,
-                                               X509_LOOKUP_TYPE type,
-                                               const X509_NAME *name);
+    X509_LOOKUP_TYPE type,
+    const X509_NAME *name);
 
 int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                     long argl, char **ret);
+    long argl, char **ret);
 int X509_LOOKUP_ctrl_ex(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-                        char **ret, OSSL_LIB_CTX *libctx, const char *propq);
+    char **ret, OSSL_LIB_CTX *libctx, const char *propq);
 
 int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
 int X509_load_cert_file_ex(X509_LOOKUP *ctx, const char *file, int type,
-                           OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
 int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
 int X509_load_cert_crl_file_ex(X509_LOOKUP *ctx, const char *file, int type,
-                               OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
 void X509_LOOKUP_free(X509_LOOKUP *ctx);
 int X509_LOOKUP_init(X509_LOOKUP *ctx);
 int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                           const X509_NAME *name, X509_OBJECT *ret);
+    const X509_NAME *name, X509_OBJECT *ret);
 int X509_LOOKUP_by_subject_ex(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                              const X509_NAME *name, X509_OBJECT *ret,
-                              OSSL_LIB_CTX *libctx, const char *propq);
+    const X509_NAME *name, X509_OBJECT *ret,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                                 const X509_NAME *name,
-                                 const ASN1_INTEGER *serial,
-                                 X509_OBJECT *ret);
+    const X509_NAME *name,
+    const ASN1_INTEGER *serial,
+    X509_OBJECT *ret);
 int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                               const unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
+    const unsigned char *bytes, int len,
+    X509_OBJECT *ret);
 int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, X509_LOOKUP_TYPE type,
-                         const char *str, int len, X509_OBJECT *ret);
+    const char *str, int len, X509_OBJECT *ret);
 int X509_LOOKUP_set_method_data(X509_LOOKUP *ctx, void *data);
 void *X509_LOOKUP_get_method_data(const X509_LOOKUP *ctx);
 X509_STORE *X509_LOOKUP_get_store(const X509_LOOKUP *ctx);
@@ -647,14 +649,14 @@ int X509_STORE_load_locations(X509_STORE *s, const char *file, const char *dir);
 int X509_STORE_set_default_paths(X509_STORE *xs);
 
 int X509_STORE_load_file_ex(X509_STORE *xs, const char *file,
-                            OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int X509_STORE_load_store_ex(X509_STORE *xs, const char *store,
-                             OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 int X509_STORE_load_locations_ex(X509_STORE *xs,
-                                 const char *file, const char *dir,
-                                 OSSL_LIB_CTX *libctx, const char *propq);
+    const char *file, const char *dir,
+    OSSL_LIB_CTX *libctx, const char *propq);
 int X509_STORE_set_default_paths_ex(X509_STORE *xs,
-                                    OSSL_LIB_CTX *libctx, const char *propq);
+    OSSL_LIB_CTX *libctx, const char *propq);
 
 #define X509_STORE_CTX_get_ex_new_index(l, p, newf, dupf, freef) \
     CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE_CTX, l, p, newf, dupf, freef)
@@ -678,12 +680,12 @@ void X509_STORE_CTX_set0_crls(X509_STORE_CTX *ctx, STACK_OF(X509_CRL) *sk);
 int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
 int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust);
 int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
-                                   int purpose, int trust);
+    int purpose, int trust);
 void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);
 void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
-                             time_t t);
+    time_t t);
 void X509_STORE_CTX_set_current_reasons(X509_STORE_CTX *ctx,
-                                        unsigned int current_reasons);
+    unsigned int current_reasons);
 
 X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(const X509_STORE_CTX *ctx);
 int X509_STORE_CTX_get_explicit_policy(const X509_STORE_CTX *ctx);
@@ -705,14 +707,14 @@ void X509_STORE_CTX_set0_dane(X509_STORE_CTX *ctx, SSL_DANE *dane);
 X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void);
 void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *to,
-                              const X509_VERIFY_PARAM *from);
+    const X509_VERIFY_PARAM *from);
 int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
-                           const X509_VERIFY_PARAM *from);
+    const X509_VERIFY_PARAM *from);
 int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name);
 int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
-                                unsigned long flags);
+    unsigned long flags);
 int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-                                  unsigned long flags);
+    unsigned long flags);
 unsigned long X509_VERIFY_PARAM_get_flags(const X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
 int X509_VERIFY_PARAM_get_purpose(const X509_VERIFY_PARAM *param);
@@ -722,32 +724,32 @@ void X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level);
 time_t X509_VERIFY_PARAM_get_time(const X509_VERIFY_PARAM *param);
 void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
 int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
-                                  ASN1_OBJECT *policy);
+    ASN1_OBJECT *policy);
 int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
-                                    STACK_OF(ASN1_OBJECT) *policies);
+    STACK_OF(ASN1_OBJECT) *policies);
 
 int X509_VERIFY_PARAM_set_inh_flags(X509_VERIFY_PARAM *param,
-                                    uint32_t flags);
+    uint32_t flags);
 uint32_t X509_VERIFY_PARAM_get_inh_flags(const X509_VERIFY_PARAM *param);
 
 char *X509_VERIFY_PARAM_get0_host(X509_VERIFY_PARAM *param, int idx);
 int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen);
+    const char *name, size_t namelen);
 int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param,
-                                const char *name, size_t namelen);
+    const char *name, size_t namelen);
 void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param,
-                                     unsigned int flags);
+    unsigned int flags);
 unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param);
 char *X509_VERIFY_PARAM_get0_peername(const X509_VERIFY_PARAM *param);
 void X509_VERIFY_PARAM_move_peername(X509_VERIFY_PARAM *, X509_VERIFY_PARAM *);
 char *X509_VERIFY_PARAM_get0_email(X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param,
-                                 const char *email, size_t emaillen);
+    const char *email, size_t emaillen);
 char *X509_VERIFY_PARAM_get1_ip_asc(X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param,
-                              const unsigned char *ip, size_t iplen);
+    const unsigned char *ip, size_t iplen);
 int X509_VERIFY_PARAM_set1_ip_asc(X509_VERIFY_PARAM *param,
-                                  const char *ipasc);
+    const char *ipasc);
 
 int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param);
 int X509_VERIFY_PARAM_get_auth_level(const X509_VERIFY_PARAM *param);
@@ -760,47 +762,46 @@ const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name);
 void X509_VERIFY_PARAM_table_cleanup(void);
 
 /* Non positive return values are errors */
-#define X509_PCY_TREE_FAILURE  -2 /* Failure to satisfy explicit policy */
-#define X509_PCY_TREE_INVALID  -1 /* Inconsistent or invalid extensions */
-#define X509_PCY_TREE_INTERNAL  0 /* Internal error, most likely malloc */
+#define X509_PCY_TREE_FAILURE -2 /* Failure to satisfy explicit policy */
+#define X509_PCY_TREE_INVALID -1 /* Inconsistent or invalid extensions */
+#define X509_PCY_TREE_INTERNAL 0 /* Internal error, most likely malloc */
 
 /*
  * Positive return values form a bit mask, all but the first are internal to
  * the library and don't appear in results from X509_policy_check().
  */
-#define X509_PCY_TREE_VALID     1 /* The policy tree is valid */
-#define X509_PCY_TREE_EMPTY     2 /* The policy tree is empty */
-#define X509_PCY_TREE_EXPLICIT  4 /* Explicit policy required */
+#define X509_PCY_TREE_VALID 1 /* The policy tree is valid */
+#define X509_PCY_TREE_EMPTY 2 /* The policy tree is empty */
+#define X509_PCY_TREE_EXPLICIT 4 /* Explicit policy required */
 
 int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
-                      STACK_OF(X509) *certs,
-                      STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags);
+    STACK_OF(X509) *certs,
+    STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags);
 
 void X509_policy_tree_free(X509_POLICY_TREE *tree);
 
 int X509_policy_tree_level_count(const X509_POLICY_TREE *tree);
 X509_POLICY_LEVEL *X509_policy_tree_get0_level(const X509_POLICY_TREE *tree,
-                                               int i);
+    int i);
 
 STACK_OF(X509_POLICY_NODE)
-    *X509_policy_tree_get0_policies(const X509_POLICY_TREE *tree);
+*X509_policy_tree_get0_policies(const X509_POLICY_TREE *tree);
 
 STACK_OF(X509_POLICY_NODE)
-    *X509_policy_tree_get0_user_policies(const X509_POLICY_TREE *tree);
+*X509_policy_tree_get0_user_policies(const X509_POLICY_TREE *tree);
 
 int X509_policy_level_node_count(X509_POLICY_LEVEL *level);
 
 X509_POLICY_NODE *X509_policy_level_get0_node(const X509_POLICY_LEVEL *level,
-                                              int i);
+    int i);
 
 const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
 
 STACK_OF(POLICYQUALINFO)
-    *X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node);
-const X509_POLICY_NODE
-    *X509_policy_node_get0_parent(const X509_POLICY_NODE *node);
+*X509_policy_node_get0_qualifiers(const X509_POLICY_NODE *node);
+const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE *node);
 
-#ifdef  __cplusplus
+#ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index 77b91c8b2cff..7123a725e825 100644
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@@ -9,62 +9,60 @@
  */
 
 #ifndef OPENSSL_X509ERR_H
-# define OPENSSL_X509ERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_X509ERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * X509 reason codes.
  */
-# define X509_R_AKID_MISMATCH                             110
-# define X509_R_BAD_SELECTOR                              133
-# define X509_R_BAD_X509_FILETYPE                         100
-# define X509_R_BASE64_DECODE_ERROR                       118
-# define X509_R_CANT_CHECK_DH_KEY                         114
-# define X509_R_CERTIFICATE_VERIFICATION_FAILED           139
-# define X509_R_CERT_ALREADY_IN_HASH_TABLE                101
-# define X509_R_CRL_ALREADY_DELTA                         127
-# define X509_R_CRL_VERIFY_FAILURE                        131
-# define X509_R_DUPLICATE_ATTRIBUTE                       140
-# define X509_R_ERROR_GETTING_MD_BY_NID                   141
-# define X509_R_ERROR_USING_SIGINF_SET                    142
-# define X509_R_IDP_MISMATCH                              128
-# define X509_R_INVALID_ATTRIBUTES                        138
-# define X509_R_INVALID_DIRECTORY                         113
-# define X509_R_INVALID_DISTPOINT                         143
-# define X509_R_INVALID_FIELD_NAME                        119
-# define X509_R_INVALID_TRUST                             123
-# define X509_R_ISSUER_MISMATCH                           129
-# define X509_R_KEY_TYPE_MISMATCH                         115
-# define X509_R_KEY_VALUES_MISMATCH                       116
-# define X509_R_LOADING_CERT_DIR                          103
-# define X509_R_LOADING_DEFAULTS                          104
-# define X509_R_METHOD_NOT_SUPPORTED                      124
-# define X509_R_NAME_TOO_LONG                             134
-# define X509_R_NEWER_CRL_NOT_NEWER                       132
-# define X509_R_NO_CERTIFICATE_FOUND                      135
-# define X509_R_NO_CERTIFICATE_OR_CRL_FOUND               136
-# define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY              105
-# define X509_R_NO_CRL_FOUND                              137
-# define X509_R_NO_CRL_NUMBER                             130
-# define X509_R_PUBLIC_KEY_DECODE_ERROR                   125
-# define X509_R_PUBLIC_KEY_ENCODE_ERROR                   126
-# define X509_R_SHOULD_RETRY                              106
-# define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN        107
-# define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY            108
-# define X509_R_UNKNOWN_KEY_TYPE                          117
-# define X509_R_UNKNOWN_NID                               109
-# define X509_R_UNKNOWN_PURPOSE_ID                        121
-# define X509_R_UNKNOWN_SIGID_ALGS                        144
-# define X509_R_UNKNOWN_TRUST_ID                          120
-# define X509_R_UNSUPPORTED_ALGORITHM                     111
-# define X509_R_UNSUPPORTED_VERSION                       145
-# define X509_R_WRONG_LOOKUP_TYPE                         112
-# define X509_R_WRONG_TYPE                                122
+#define X509_R_AKID_MISMATCH 110
+#define X509_R_BAD_SELECTOR 133
+#define X509_R_BAD_X509_FILETYPE 100
+#define X509_R_BASE64_DECODE_ERROR 118
+#define X509_R_CANT_CHECK_DH_KEY 114
+#define X509_R_CERTIFICATE_VERIFICATION_FAILED 139
+#define X509_R_CERT_ALREADY_IN_HASH_TABLE 101
+#define X509_R_CRL_ALREADY_DELTA 127
+#define X509_R_CRL_VERIFY_FAILURE 131
+#define X509_R_DUPLICATE_ATTRIBUTE 140
+#define X509_R_ERROR_GETTING_MD_BY_NID 141
+#define X509_R_ERROR_USING_SIGINF_SET 142
+#define X509_R_IDP_MISMATCH 128
+#define X509_R_INVALID_ATTRIBUTES 138
+#define X509_R_INVALID_DIRECTORY 113
+#define X509_R_INVALID_DISTPOINT 143
+#define X509_R_INVALID_FIELD_NAME 119
+#define X509_R_INVALID_TRUST 123
+#define X509_R_ISSUER_MISMATCH 129
+#define X509_R_KEY_TYPE_MISMATCH 115
+#define X509_R_KEY_VALUES_MISMATCH 116
+#define X509_R_LOADING_CERT_DIR 103
+#define X509_R_LOADING_DEFAULTS 104
+#define X509_R_METHOD_NOT_SUPPORTED 124
+#define X509_R_NAME_TOO_LONG 134
+#define X509_R_NEWER_CRL_NOT_NEWER 132
+#define X509_R_NO_CERTIFICATE_FOUND 135
+#define X509_R_NO_CERTIFICATE_OR_CRL_FOUND 136
+#define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY 105
+#define X509_R_NO_CRL_FOUND 137
+#define X509_R_NO_CRL_NUMBER 130
+#define X509_R_PUBLIC_KEY_DECODE_ERROR 125
+#define X509_R_PUBLIC_KEY_ENCODE_ERROR 126
+#define X509_R_SHOULD_RETRY 106
+#define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN 107
+#define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY 108
+#define X509_R_UNKNOWN_KEY_TYPE 117
+#define X509_R_UNKNOWN_NID 109
+#define X509_R_UNKNOWN_PURPOSE_ID 121
+#define X509_R_UNKNOWN_SIGID_ALGS 144
+#define X509_R_UNKNOWN_TRUST_ID 120
+#define X509_R_UNSUPPORTED_ALGORITHM 111
+#define X509_R_UNSUPPORTED_VERSION 145
+#define X509_R_WRONG_LOOKUP_TYPE 112
+#define X509_R_WRONG_TYPE 122
 
 #endif
diff --git a/include/openssl/x509v3.h.in b/include/openssl/x509v3.h.in
index baf8b5ab1cff..29231d22decb 100644
--- a/include/openssl/x509v3.h.in
+++ b/include/openssl/x509v3.h.in
@@ -9,26 +9,28 @@
  * https://www.openssl.org/source/license.html
  */
 
+/* clang-format off */
 {-
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
+/* clang-format on */
 
 #ifndef OPENSSL_X509V3_H
-# define OPENSSL_X509V3_H
-# pragma once
+#define OPENSSL_X509V3_H
+#pragma once
 
-# include <openssl/macros.h>
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define HEADER_X509V3_H
-# endif
+#include <openssl/macros.h>
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define HEADER_X509V3_H
+#endif
 
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-# include <openssl/x509v3err.h>
-# ifndef OPENSSL_NO_STDIO
-#  include <stdio.h>
-# endif
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/conf.h>
+#include <openssl/x509v3err.h>
+#ifndef OPENSSL_NO_STDIO
+#include <stdio.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,62 +43,61 @@ struct v3_ext_ctx;
 /* Useful typedefs */
 
 typedef void *(*X509V3_EXT_NEW)(void);
-typedef void (*X509V3_EXT_FREE) (void *);
+typedef void (*X509V3_EXT_FREE)(void *);
 typedef void *(*X509V3_EXT_D2I)(void *, const unsigned char **, long);
-typedef int (*X509V3_EXT_I2D) (const void *, unsigned char **);
-typedef STACK_OF(CONF_VALUE) *
-    (*X509V3_EXT_I2V) (const struct v3_ext_method *method, void *ext,
-                       STACK_OF(CONF_VALUE) *extlist);
+typedef int (*X509V3_EXT_I2D)(const void *, unsigned char **);
+typedef STACK_OF(CONF_VALUE) *(*X509V3_EXT_I2V)(const struct v3_ext_method *method, void *ext,
+    STACK_OF(CONF_VALUE) *extlist);
 typedef void *(*X509V3_EXT_V2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx,
-                                STACK_OF(CONF_VALUE) *values);
+    struct v3_ext_ctx *ctx,
+    STACK_OF(CONF_VALUE) *values);
 typedef char *(*X509V3_EXT_I2S)(const struct v3_ext_method *method,
-                                void *ext);
+    void *ext);
 typedef void *(*X509V3_EXT_S2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-typedef int (*X509V3_EXT_I2R) (const struct v3_ext_method *method, void *ext,
-                               BIO *out, int indent);
+    struct v3_ext_ctx *ctx, const char *str);
+typedef int (*X509V3_EXT_I2R)(const struct v3_ext_method *method, void *ext,
+    BIO *out, int indent);
 typedef void *(*X509V3_EXT_R2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
+    struct v3_ext_ctx *ctx, const char *str);
 
 /* V3 extension structure */
 
 struct v3_ext_method {
     int ext_nid;
     int ext_flags;
-/* If this is set the following four fields are ignored */
+    /* If this is set the following four fields are ignored */
     ASN1_ITEM_EXP *it;
-/* Old style ASN1 calls */
+    /* Old style ASN1 calls */
     X509V3_EXT_NEW ext_new;
     X509V3_EXT_FREE ext_free;
     X509V3_EXT_D2I d2i;
     X509V3_EXT_I2D i2d;
-/* The following pair is used for string extensions */
+    /* The following pair is used for string extensions */
     X509V3_EXT_I2S i2s;
     X509V3_EXT_S2I s2i;
-/* The following pair is used for multi-valued extensions */
+    /* The following pair is used for multi-valued extensions */
     X509V3_EXT_I2V i2v;
     X509V3_EXT_V2I v2i;
-/* The following are used for raw extensions */
+    /* The following are used for raw extensions */
     X509V3_EXT_I2R i2r;
     X509V3_EXT_R2I r2i;
-    void *usr_data;             /* Any extension specific data */
+    void *usr_data; /* Any extension specific data */
 };
 
 typedef struct X509V3_CONF_METHOD_st {
-    char *(*get_string) (void *db, const char *section, const char *value);
-    STACK_OF(CONF_VALUE) *(*get_section) (void *db, const char *section);
-    void (*free_string) (void *db, char *string);
-    void (*free_section) (void *db, STACK_OF(CONF_VALUE) *section);
+    char *(*get_string)(void *db, const char *section, const char *value);
+    STACK_OF(CONF_VALUE) *(*get_section)(void *db, const char *section);
+    void (*free_string)(void *db, char *string);
+    void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section);
 } X509V3_CONF_METHOD;
 
 /* Context specific info for producing X509 v3 extensions*/
 struct v3_ext_ctx {
-# define X509V3_CTX_TEST 0x1
-# ifndef OPENSSL_NO_DEPRECATED_3_0
-#  define CTX_TEST X509V3_CTX_TEST
-# endif
-# define X509V3_CTX_REPLACE 0x2
+#define X509V3_CTX_TEST 0x1
+#ifndef OPENSSL_NO_DEPRECATED_3_0
+#define CTX_TEST X509V3_CTX_TEST
+#endif
+#define X509V3_CTX_REPLACE 0x2
     int flags;
     X509 *issuer_cert;
     X509 *subject_cert;
@@ -105,19 +106,21 @@ struct v3_ext_ctx {
     X509V3_CONF_METHOD *db_meth;
     void *db;
     EVP_PKEY *issuer_pkey;
-/* Maybe more here */
+    /* Maybe more here */
 };
 
 typedef struct v3_ext_method X509V3_EXT_METHOD;
 
+/* clang-format off */
 {-
     generate_stack_macros("X509V3_EXT_METHOD");
 -}
+/* clang-format on */
 
 /* ext_flags values */
-# define X509V3_EXT_DYNAMIC      0x1
-# define X509V3_EXT_CTX_DEP      0x2
-# define X509V3_EXT_MULTILINE    0x4
+#define X509V3_EXT_DYNAMIC 0x1
+#define X509V3_EXT_CTX_DEP 0x2
+#define X509V3_EXT_MULTILINE 0x4
 
 typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
 
@@ -147,19 +150,19 @@ typedef struct EDIPartyName_st {
 } EDIPARTYNAME;
 
 typedef struct GENERAL_NAME_st {
-# define GEN_OTHERNAME   0
-# define GEN_EMAIL       1
-# define GEN_DNS         2
-# define GEN_X400        3
-# define GEN_DIRNAME     4
-# define GEN_EDIPARTY    5
-# define GEN_URI         6
-# define GEN_IPADD       7
-# define GEN_RID         8
+#define GEN_OTHERNAME 0
+#define GEN_EMAIL 1
+#define GEN_DNS 2
+#define GEN_X400 3
+#define GEN_DIRNAME 4
+#define GEN_EDIPARTY 5
+#define GEN_URI 6
+#define GEN_IPADD 7
+#define GEN_RID 8
     int type;
     union {
         char *ptr;
-        OTHERNAME *otherName;   /* otherName */
+        OTHERNAME *otherName; /* otherName */
         ASN1_IA5STRING *rfc822Name;
         ASN1_IA5STRING *dNSName;
         ASN1_STRING *x400Address;
@@ -169,12 +172,12 @@ typedef struct GENERAL_NAME_st {
         ASN1_OCTET_STRING *iPAddress;
         ASN1_OBJECT *registeredID;
         /* Old names */
-        ASN1_OCTET_STRING *ip;  /* iPAddress */
-        X509_NAME *dirn;        /* dirn */
-        ASN1_IA5STRING *ia5;    /* rfc822Name, dNSName,
-                                 * uniformResourceIdentifier */
-        ASN1_OBJECT *rid;       /* registeredID */
-        ASN1_TYPE *other;       /* x400Address */
+        ASN1_OCTET_STRING *ip; /* iPAddress */
+        X509_NAME *dirn; /* dirn */
+        ASN1_IA5STRING *ia5; /* rfc822Name, dNSName,
+                              * uniformResourceIdentifier */
+        ASN1_OBJECT *rid; /* registeredID */
+        ASN1_TYPE *other; /* x400Address */
     } d;
 } GENERAL_NAME;
 
@@ -185,19 +188,23 @@ typedef struct ACCESS_DESCRIPTION_st {
 
 int GENERAL_NAME_set1_X509_NAME(GENERAL_NAME **tgt, const X509_NAME *src);
 
+/* clang-format off */
 {-
     generate_stack_macros("ACCESS_DESCRIPTION")
     .generate_stack_macros("GENERAL_NAME");
 -}
+/* clang-format on */
 
 typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
 typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
 typedef STACK_OF(ASN1_INTEGER) TLS_FEATURE;
 typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
 
+/* clang-format off */
 {-
     generate_stack_macros("GENERAL_NAMES");
 -}
+/* clang-format on */
 
 typedef struct DIST_POINT_NAME_st {
     int type;
@@ -205,24 +212,24 @@ typedef struct DIST_POINT_NAME_st {
         GENERAL_NAMES *fullname;
         STACK_OF(X509_NAME_ENTRY) *relativename;
     } name;
-/* If relativename then this contains the full distribution point name */
+    /* If relativename then this contains the full distribution point name */
     X509_NAME *dpname;
 } DIST_POINT_NAME;
 DECLARE_ASN1_DUP_FUNCTION(DIST_POINT_NAME)
 /* All existing reasons */
-# define CRLDP_ALL_REASONS       0x807f
+#define CRLDP_ALL_REASONS 0x807f
 
-# define CRL_REASON_NONE                         -1
-# define CRL_REASON_UNSPECIFIED                  0
-# define CRL_REASON_KEY_COMPROMISE               1
-# define CRL_REASON_CA_COMPROMISE                2
-# define CRL_REASON_AFFILIATION_CHANGED          3
-# define CRL_REASON_SUPERSEDED                   4
-# define CRL_REASON_CESSATION_OF_OPERATION       5
-# define CRL_REASON_CERTIFICATE_HOLD             6
-# define CRL_REASON_REMOVE_FROM_CRL              8
-# define CRL_REASON_PRIVILEGE_WITHDRAWN          9
-# define CRL_REASON_AA_COMPROMISE                10
+#define CRL_REASON_NONE -1
+#define CRL_REASON_UNSPECIFIED 0
+#define CRL_REASON_KEY_COMPROMISE 1
+#define CRL_REASON_CA_COMPROMISE 2
+#define CRL_REASON_AFFILIATION_CHANGED 3
+#define CRL_REASON_SUPERSEDED 4
+#define CRL_REASON_CESSATION_OF_OPERATION 5
+#define CRL_REASON_CERTIFICATE_HOLD 6
+#define CRL_REASON_REMOVE_FROM_CRL 8
+#define CRL_REASON_PRIVILEGE_WITHDRAWN 9
+#define CRL_REASON_AA_COMPROMISE 10
 
 struct DIST_POINT_st {
     DIST_POINT_NAME *distpoint;
@@ -231,9 +238,11 @@ struct DIST_POINT_st {
     int dp_reasons;
 };
 
+/* clang-format off */
 {-
     generate_stack_macros("DIST_POINT");
 -}
+/* clang-format on */
 
 typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
 
@@ -250,10 +259,11 @@ typedef struct SXNET_ID_st {
     ASN1_OCTET_STRING *user;
 } SXNETID;
 
+/* clang-format off */
 {-
     generate_stack_macros("SXNETID");
 -}
-
+/* clang-format on */
 
 typedef struct SXNET_st {
     ASN1_INTEGER *version;
@@ -286,19 +296,22 @@ typedef struct POLICYQUALINFO_st {
     } d;
 } POLICYQUALINFO;
 
+/* clang-format off */
 {-
     generate_stack_macros("POLICYQUALINFO");
 -}
-
+/* clang-format on */
 
 typedef struct POLICYINFO_st {
     ASN1_OBJECT *policyid;
     STACK_OF(POLICYQUALINFO) *qualifiers;
 } POLICYINFO;
 
+/* clang-format off */
 {-
     generate_stack_macros("POLICYINFO");
 -}
+/* clang-format on */
 
 typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
 
@@ -307,9 +320,11 @@ typedef struct POLICY_MAPPING_st {
     ASN1_OBJECT *subjectDomainPolicy;
 } POLICY_MAPPING;
 
+/* clang-format off */
 {-
     generate_stack_macros("POLICY_MAPPING");
 -}
+/* clang-format on */
 
 typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
 
@@ -319,9 +334,11 @@ typedef struct GENERAL_SUBTREE_st {
     ASN1_INTEGER *maximum;
 } GENERAL_SUBTREE;
 
+/* clang-format off */
 {-
     generate_stack_macros("GENERAL_SUBTREE");
 -}
+/* clang-format on */
 
 struct NAME_CONSTRAINTS_st {
     STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
@@ -358,162 +375,166 @@ struct ISSUING_DIST_POINT_st {
 
 /* Values in idp_flags field */
 /* IDP present */
-# define IDP_PRESENT     0x1
+#define IDP_PRESENT 0x1
 /* IDP values inconsistent */
-# define IDP_INVALID     0x2
+#define IDP_INVALID 0x2
 /* onlyuser true */
-# define IDP_ONLYUSER    0x4
+#define IDP_ONLYUSER 0x4
 /* onlyCA true */
-# define IDP_ONLYCA      0x8
+#define IDP_ONLYCA 0x8
 /* onlyattr true */
-# define IDP_ONLYATTR    0x10
+#define IDP_ONLYATTR 0x10
 /* indirectCRL true */
-# define IDP_INDIRECT    0x20
+#define IDP_INDIRECT 0x20
 /* onlysomereasons present */
-# define IDP_REASONS     0x40
+#define IDP_REASONS 0x40
 
-# define X509V3_conf_err(val) ERR_add_error_data(6, \
-                        "section:", (val)->section, \
-                        ",name:", (val)->name, ",value:", (val)->value)
+#define X509V3_conf_err(val) ERR_add_error_data(6, \
+    "section:", (val)->section,                    \
+    ",name:", (val)->name, ",value:", (val)->value)
 
-# define X509V3_set_ctx_test(ctx) \
+#define X509V3_set_ctx_test(ctx) \
     X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, X509V3_CTX_TEST)
-# define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
+#define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
 
-# define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
-                        0,0,0,0, \
-                        0,0, \
-                        (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
-                        (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
-                        NULL, NULL, \
-                        table}
+#define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
+    0, 0, 0, 0,                                                             \
+    0, 0,                                                                   \
+    (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING,                                    \
+    (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING,                                    \
+    NULL, NULL,                                                             \
+    table }
 
-# define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
-                        0,0,0,0, \
-                        (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
-                        (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
-                        0,0,0,0, \
-                        NULL}
+#define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
+    0, 0, 0, 0,                                                     \
+    (X509V3_EXT_I2S)i2s_ASN1_IA5STRING,                             \
+    (X509V3_EXT_S2I)s2i_ASN1_IA5STRING,                             \
+    0, 0, 0, 0,                                                     \
+    NULL }
 
 #define EXT_UTF8STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_UTF8STRING), \
-                        0,0,0,0, \
-                        (X509V3_EXT_I2S)i2s_ASN1_UTF8STRING, \
-                        (X509V3_EXT_S2I)s2i_ASN1_UTF8STRING, \
-                        0,0,0,0, \
-                        NULL}
+    0, 0, 0, 0,                                                       \
+    (X509V3_EXT_I2S)i2s_ASN1_UTF8STRING,                              \
+    (X509V3_EXT_S2I)s2i_ASN1_UTF8STRING,                              \
+    0, 0, 0, 0,                                                       \
+    NULL }
 
+/* clang-format off */
 # define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+/* clang-format on */
 
 /* X509_PURPOSE stuff */
 
-# define EXFLAG_BCONS            0x1
-# define EXFLAG_KUSAGE           0x2
-# define EXFLAG_XKUSAGE          0x4
-# define EXFLAG_NSCERT           0x8
+#define EXFLAG_BCONS 0x1
+#define EXFLAG_KUSAGE 0x2
+#define EXFLAG_XKUSAGE 0x4
+#define EXFLAG_NSCERT 0x8
 
-# define EXFLAG_CA               0x10
-# define EXFLAG_SI               0x20 /* self-issued, maybe not self-signed */
-# define EXFLAG_V1               0x40
-# define EXFLAG_INVALID          0x80
+#define EXFLAG_CA 0x10
+#define EXFLAG_SI 0x20 /* self-issued, maybe not self-signed */
+#define EXFLAG_V1 0x40
+#define EXFLAG_INVALID 0x80
 /* EXFLAG_SET is set to indicate that some values have been precomputed */
-# define EXFLAG_SET              0x100
-# define EXFLAG_CRITICAL         0x200
-# define EXFLAG_PROXY            0x400
+#define EXFLAG_SET 0x100
+#define EXFLAG_CRITICAL 0x200
+#define EXFLAG_PROXY 0x400
 
-# define EXFLAG_INVALID_POLICY   0x800
-# define EXFLAG_FRESHEST         0x1000
-# define EXFLAG_SS               0x2000 /* cert is apparently self-signed */
+#define EXFLAG_INVALID_POLICY 0x800
+#define EXFLAG_FRESHEST 0x1000
+#define EXFLAG_SS 0x2000 /* cert is apparently self-signed */
 
-# define EXFLAG_BCONS_CRITICAL   0x10000
-# define EXFLAG_AKID_CRITICAL    0x20000
-# define EXFLAG_SKID_CRITICAL    0x40000
-# define EXFLAG_SAN_CRITICAL     0x80000
-# define EXFLAG_NO_FINGERPRINT   0x100000
+#define EXFLAG_BCONS_CRITICAL 0x10000
+#define EXFLAG_AKID_CRITICAL 0x20000
+#define EXFLAG_SKID_CRITICAL 0x40000
+#define EXFLAG_SAN_CRITICAL 0x80000
+#define EXFLAG_NO_FINGERPRINT 0x100000
 
 /* https://datatracker.ietf.org/doc/html/rfc5280#section-4.2.1.3 */
-# define KU_DIGITAL_SIGNATURE    X509v3_KU_DIGITAL_SIGNATURE
-# define KU_NON_REPUDIATION      X509v3_KU_NON_REPUDIATION
-# define KU_KEY_ENCIPHERMENT     X509v3_KU_KEY_ENCIPHERMENT
-# define KU_DATA_ENCIPHERMENT    X509v3_KU_DATA_ENCIPHERMENT
-# define KU_KEY_AGREEMENT        X509v3_KU_KEY_AGREEMENT
-# define KU_KEY_CERT_SIGN        X509v3_KU_KEY_CERT_SIGN
-# define KU_CRL_SIGN             X509v3_KU_CRL_SIGN
-# define KU_ENCIPHER_ONLY        X509v3_KU_ENCIPHER_ONLY
-# define KU_DECIPHER_ONLY        X509v3_KU_DECIPHER_ONLY
+#define KU_DIGITAL_SIGNATURE X509v3_KU_DIGITAL_SIGNATURE
+#define KU_NON_REPUDIATION X509v3_KU_NON_REPUDIATION
+#define KU_KEY_ENCIPHERMENT X509v3_KU_KEY_ENCIPHERMENT
+#define KU_DATA_ENCIPHERMENT X509v3_KU_DATA_ENCIPHERMENT
+#define KU_KEY_AGREEMENT X509v3_KU_KEY_AGREEMENT
+#define KU_KEY_CERT_SIGN X509v3_KU_KEY_CERT_SIGN
+#define KU_CRL_SIGN X509v3_KU_CRL_SIGN
+#define KU_ENCIPHER_ONLY X509v3_KU_ENCIPHER_ONLY
+#define KU_DECIPHER_ONLY X509v3_KU_DECIPHER_ONLY
 
-# define NS_SSL_CLIENT           0x80
-# define NS_SSL_SERVER           0x40
-# define NS_SMIME                0x20
-# define NS_OBJSIGN              0x10
-# define NS_SSL_CA               0x04
-# define NS_SMIME_CA             0x02
-# define NS_OBJSIGN_CA           0x01
-# define NS_ANY_CA               (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
+#define NS_SSL_CLIENT 0x80
+#define NS_SSL_SERVER 0x40
+#define NS_SMIME 0x20
+#define NS_OBJSIGN 0x10
+#define NS_SSL_CA 0x04
+#define NS_SMIME_CA 0x02
+#define NS_OBJSIGN_CA 0x01
+#define NS_ANY_CA (NS_SSL_CA | NS_SMIME_CA | NS_OBJSIGN_CA)
 
-# define XKU_SSL_SERVER          0x1
-# define XKU_SSL_CLIENT          0x2
-# define XKU_SMIME               0x4
-# define XKU_CODE_SIGN           0x8
-# define XKU_SGC                 0x10 /* Netscape or MS Server-Gated Crypto */
-# define XKU_OCSP_SIGN           0x20
-# define XKU_TIMESTAMP           0x40
-# define XKU_DVCS                0x80
-# define XKU_ANYEKU              0x100
+#define XKU_SSL_SERVER 0x1
+#define XKU_SSL_CLIENT 0x2
+#define XKU_SMIME 0x4
+#define XKU_CODE_SIGN 0x8
+#define XKU_SGC 0x10 /* Netscape or MS Server-Gated Crypto */
+#define XKU_OCSP_SIGN 0x20
+#define XKU_TIMESTAMP 0x40
+#define XKU_DVCS 0x80
+#define XKU_ANYEKU 0x100
 
-# define X509_PURPOSE_DYNAMIC    0x1
-# define X509_PURPOSE_DYNAMIC_NAME       0x2
+#define X509_PURPOSE_DYNAMIC 0x1
+#define X509_PURPOSE_DYNAMIC_NAME 0x2
 
 typedef struct x509_purpose_st {
     int purpose;
-    int trust;                  /* Default trust ID */
+    int trust; /* Default trust ID */
     int flags;
-    int (*check_purpose) (const struct x509_purpose_st *, const X509 *, int);
+    int (*check_purpose)(const struct x509_purpose_st *, const X509 *, int);
     char *name;
     char *sname;
     void *usr_data;
 } X509_PURPOSE;
 
+/* clang-format off */
 {-
     generate_stack_macros("X509_PURPOSE");
 -}
+/* clang-format on */
 
-# define X509_PURPOSE_DEFAULT_ANY        0
-# define X509_PURPOSE_SSL_CLIENT         1
-# define X509_PURPOSE_SSL_SERVER         2
-# define X509_PURPOSE_NS_SSL_SERVER      3
-# define X509_PURPOSE_SMIME_SIGN         4
-# define X509_PURPOSE_SMIME_ENCRYPT      5
-# define X509_PURPOSE_CRL_SIGN           6
-# define X509_PURPOSE_ANY                7
-# define X509_PURPOSE_OCSP_HELPER        8
-# define X509_PURPOSE_TIMESTAMP_SIGN     9
-# define X509_PURPOSE_CODE_SIGN         10
+#define X509_PURPOSE_DEFAULT_ANY 0
+#define X509_PURPOSE_SSL_CLIENT 1
+#define X509_PURPOSE_SSL_SERVER 2
+#define X509_PURPOSE_NS_SSL_SERVER 3
+#define X509_PURPOSE_SMIME_SIGN 4
+#define X509_PURPOSE_SMIME_ENCRYPT 5
+#define X509_PURPOSE_CRL_SIGN 6
+#define X509_PURPOSE_ANY 7
+#define X509_PURPOSE_OCSP_HELPER 8
+#define X509_PURPOSE_TIMESTAMP_SIGN 9
+#define X509_PURPOSE_CODE_SIGN 10
 
-# define X509_PURPOSE_MIN                1
-# define X509_PURPOSE_MAX               10
+#define X509_PURPOSE_MIN 1
+#define X509_PURPOSE_MAX 10
 
 /* Flags for X509V3_EXT_print() */
 
-# define X509V3_EXT_UNKNOWN_MASK         (0xfL << 16)
+#define X509V3_EXT_UNKNOWN_MASK (0xfL << 16)
 /* Return error for unknown extensions */
-# define X509V3_EXT_DEFAULT              0
+#define X509V3_EXT_DEFAULT 0
 /* Print error for unknown extensions */
-# define X509V3_EXT_ERROR_UNKNOWN        (1L << 16)
+#define X509V3_EXT_ERROR_UNKNOWN (1L << 16)
 /* ASN1 parse unknown extensions */
-# define X509V3_EXT_PARSE_UNKNOWN        (2L << 16)
+#define X509V3_EXT_PARSE_UNKNOWN (2L << 16)
 /* BIO_dump unknown extensions */
-# define X509V3_EXT_DUMP_UNKNOWN         (3L << 16)
+#define X509V3_EXT_DUMP_UNKNOWN (3L << 16)
 
 /* Flags for X509V3_add1_i2d */
 
-# define X509V3_ADD_OP_MASK              0xfL
-# define X509V3_ADD_DEFAULT              0L
-# define X509V3_ADD_APPEND               1L
-# define X509V3_ADD_REPLACE              2L
-# define X509V3_ADD_REPLACE_EXISTING     3L
-# define X509V3_ADD_KEEP_EXISTING        4L
-# define X509V3_ADD_DELETE               5L
-# define X509V3_ADD_SILENT               0x10
+#define X509V3_ADD_OP_MASK 0xfL
+#define X509V3_ADD_DEFAULT 0L
+#define X509V3_ADD_APPEND 1L
+#define X509V3_ADD_REPLACE 2L
+#define X509V3_ADD_REPLACE_EXISTING 3L
+#define X509V3_ADD_KEEP_EXISTING 4L
+#define X509V3_ADD_DELETE 5L
+#define X509V3_ADD_SILENT 0x10
 
 DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
 DECLARE_ASN1_FUNCTIONS(OSSL_BASIC_ATTR_CONSTRAINTS)
@@ -525,9 +546,9 @@ DECLARE_ASN1_FUNCTIONS(ISSUER_SIGN_TOOL)
 
 int SXNET_add_id_asc(SXNET **psx, const char *zone, const char *user, int userlen);
 int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, const char *user,
-                       int userlen);
+    int userlen);
 int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, const char *user,
-                         int userlen);
+    int userlen);
 
 ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, const char *zone);
 ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
@@ -542,30 +563,30 @@ DECLARE_ASN1_DUP_FUNCTION(GENERAL_NAME)
 int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b);
 
 ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx,
-                                     STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx,
+    STACK_OF(CONF_VALUE) *nval);
 STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                          ASN1_BIT_STRING *bits,
-                                          STACK_OF(CONF_VALUE) *extlist);
+    ASN1_BIT_STRING *bits,
+    STACK_OF(CONF_VALUE) *extlist);
 char *i2s_ASN1_IA5STRING(X509V3_EXT_METHOD *method, ASN1_IA5STRING *ia5);
 ASN1_IA5STRING *s2i_ASN1_IA5STRING(X509V3_EXT_METHOD *method,
-                                   X509V3_CTX *ctx, const char *str);
+    X509V3_CTX *ctx, const char *str);
 char *i2s_ASN1_UTF8STRING(X509V3_EXT_METHOD *method, ASN1_UTF8STRING *utf8);
 ASN1_UTF8STRING *s2i_ASN1_UTF8STRING(X509V3_EXT_METHOD *method,
-                                   X509V3_CTX *ctx, const char *str);
+    X509V3_CTX *ctx, const char *str);
 
 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
-                                       GENERAL_NAME *gen,
-                                       STACK_OF(CONF_VALUE) *ret);
+    GENERAL_NAME *gen,
+    STACK_OF(CONF_VALUE) *ret);
 int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
 
 DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
 
 STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                        GENERAL_NAMES *gen,
-                                        STACK_OF(CONF_VALUE) *extlist);
+    GENERAL_NAMES *gen,
+    STACK_OF(CONF_VALUE) *extlist);
 GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
+    X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
 
 DECLARE_ASN1_FUNCTIONS(OTHERNAME)
 DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
@@ -573,14 +594,14 @@ int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
 void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
 void *GENERAL_NAME_get0_value(const GENERAL_NAME *a, int *ptype);
 int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-                                ASN1_OBJECT *oid, ASN1_TYPE *value);
+    ASN1_OBJECT *oid, ASN1_TYPE *value);
 int GENERAL_NAME_get0_otherName(const GENERAL_NAME *gen,
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
+    ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
 
 char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                            const ASN1_OCTET_STRING *ia5);
+    const ASN1_OCTET_STRING *ia5);
 ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, const char *str);
+    X509V3_CTX *ctx, const char *str);
 
 DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
 int i2a_ACCESS_DESCRIPTION(BIO *bp, const ACCESS_DESCRIPTION *a);
@@ -620,75 +641,75 @@ DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
 DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
 
 GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
-                               const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, int gen_type,
-                               const char *value, int is_nc);
+    const X509V3_EXT_METHOD *method,
+    X509V3_CTX *ctx, int gen_type,
+    const char *value, int is_nc);
 
-# ifdef OPENSSL_CONF_H
+#ifdef OPENSSL_CONF_H
 GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, CONF_VALUE *cnf);
+    X509V3_CTX *ctx, CONF_VALUE *cnf);
 GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
-                                  const X509V3_EXT_METHOD *method,
-                                  X509V3_CTX *ctx, CONF_VALUE *cnf,
-                                  int is_nc);
+    const X509V3_EXT_METHOD *method,
+    X509V3_CTX *ctx, CONF_VALUE *cnf,
+    int is_nc);
 
 void X509V3_conf_free(CONF_VALUE *val);
 
 X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                     const char *value);
+    const char *value);
 X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, const char *name,
-                                 const char *value);
+    const char *value);
 int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, const char *section,
-                            STACK_OF(X509_EXTENSION) **sk);
+    STACK_OF(X509_EXTENSION) **sk);
 int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                         X509 *cert);
+    X509 *cert);
 int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                             X509_REQ *req);
+    X509_REQ *req);
 int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, const char *section,
-                             X509_CRL *crl);
+    X509_CRL *crl);
 
 X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
-                                    X509V3_CTX *ctx, int ext_nid,
-                                    const char *value);
+    X509V3_CTX *ctx, int ext_nid,
+    const char *value);
 X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                                const char *name, const char *value);
+    const char *name, const char *value);
 int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                        const char *section, X509 *cert);
+    const char *section, X509 *cert);
 int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            const char *section, X509_REQ *req);
+    const char *section, X509_REQ *req);
 int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            const char *section, X509_CRL *crl);
+    const char *section, X509_CRL *crl);
 
 int X509V3_add_value_bool_nf(const char *name, int asn1_bool,
-                             STACK_OF(CONF_VALUE) **extlist);
+    STACK_OF(CONF_VALUE) **extlist);
 int X509V3_get_value_bool(const CONF_VALUE *value, int *asn1_bool);
 int X509V3_get_value_int(const CONF_VALUE *value, ASN1_INTEGER **aint);
 void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
 void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
-# endif
+#endif
 
 char *X509V3_get_string(X509V3_CTX *ctx, const char *name, const char *section);
 STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, const char *section);
 void X509V3_string_free(X509V3_CTX *ctx, char *str);
 void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
 void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-                    X509_REQ *req, X509_CRL *crl, int flags);
+    X509_REQ *req, X509_CRL *crl, int flags);
 /* For API backward compatibility, this is separate from X509V3_set_ctx(): */
 int X509V3_set_issuer_pkey(X509V3_CTX *ctx, EVP_PKEY *pkey);
 
 int X509V3_add_value(const char *name, const char *value,
-                     STACK_OF(CONF_VALUE) **extlist);
+    STACK_OF(CONF_VALUE) **extlist);
 int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                           STACK_OF(CONF_VALUE) **extlist);
+    STACK_OF(CONF_VALUE) **extlist);
 int X509V3_add_value_bool(const char *name, int asn1_bool,
-                          STACK_OF(CONF_VALUE) **extlist);
+    STACK_OF(CONF_VALUE) **extlist);
 int X509V3_add_value_int(const char *name, const ASN1_INTEGER *aint,
-                         STACK_OF(CONF_VALUE) **extlist);
+    STACK_OF(CONF_VALUE) **extlist);
 char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, const ASN1_INTEGER *aint);
 ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, const char *value);
 char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, const ASN1_ENUMERATED *aint);
 char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth,
-                                const ASN1_ENUMERATED *aint);
+    const ASN1_ENUMERATED *aint);
 int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
 int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
 int X509V3_EXT_add_alias(int nid_to, int nid_from);
@@ -700,28 +721,28 @@ int X509V3_add_standard_extensions(void);
 STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
 void *X509V3_EXT_d2i(X509_EXTENSION *ext);
 void *X509V3_get_d2i(const STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
-                     int *idx);
+    int *idx);
 
 X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
 int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
-                    int crit, unsigned long flags);
+    int crit, unsigned long flags);
 
 #ifndef OPENSSL_NO_DEPRECATED_1_1_0
 /* The new declarations are in crypto.h, but the old ones were here. */
-# define hex_to_string OPENSSL_buf2hexstr
-# define string_to_hex OPENSSL_hexstr2buf
+#define hex_to_string OPENSSL_buf2hexstr
+#define string_to_hex OPENSSL_hexstr2buf
 #endif
 
 void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-                        int ml);
+    int ml);
 int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
-                     int indent);
+    int indent);
 #ifndef OPENSSL_NO_STDIO
 int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
 #endif
 int X509V3_extensions_print(BIO *out, const char *title,
-                            const STACK_OF(X509_EXTENSION) *exts,
-                            unsigned long flag, int indent);
+    const STACK_OF(X509_EXTENSION) *exts,
+    unsigned long flag, int indent);
 
 int X509_check_ca(X509 *x);
 int X509_check_purpose(X509 *x, int id, int ca);
@@ -745,8 +766,8 @@ int X509_PURPOSE_get_unused_id(OSSL_LIB_CTX *libctx);
 int X509_PURPOSE_get_by_sname(const char *sname);
 int X509_PURPOSE_get_by_id(int id);
 int X509_PURPOSE_add(int id, int trust, int flags,
-                     int (*ck) (const X509_PURPOSE *, const X509 *, int),
-                     const char *name, const char *sname, void *arg);
+    int (*ck)(const X509_PURPOSE *, const X509 *, int),
+    const char *name, const char *sname, void *arg);
 void X509_PURPOSE_cleanup(void);
 
 X509_PURPOSE *X509_PURPOSE_get0(int idx);
@@ -766,50 +787,51 @@ STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
 /*
  * Always check subject name for host match even if subject alt names present
  */
-# define X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT    0x1
+#define X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT 0x1
 /* Disable wildcard matching for dnsName fields and common name. */
-# define X509_CHECK_FLAG_NO_WILDCARDS    0x2
+#define X509_CHECK_FLAG_NO_WILDCARDS 0x2
 /* Wildcards must not match a partial label. */
-# define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0x4
+#define X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS 0x4
 /* Allow (non-partial) wildcards to match multiple labels. */
-# define X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS 0x8
+#define X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS 0x8
 /* Constraint verifier subdomain patterns to match a single labels. */
-# define X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10
+#define X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS 0x10
 /* Never check the subject CN */
-# define X509_CHECK_FLAG_NEVER_CHECK_SUBJECT    0x20
+#define X509_CHECK_FLAG_NEVER_CHECK_SUBJECT 0x20
 /*
  * Match reference identifiers starting with "." to any sub-domain.
  * This is a non-public flag, turned on implicitly when the subject
  * reference identity is a DNS name.
  */
-# define _X509_CHECK_FLAG_DOT_SUBDOMAINS 0x8000
+#define _X509_CHECK_FLAG_DOT_SUBDOMAINS 0x8000
 
 int X509_check_host(X509 *x, const char *chk, size_t chklen,
-                    unsigned int flags, char **peername);
+    unsigned int flags, char **peername);
 int X509_check_email(X509 *x, const char *chk, size_t chklen,
-                     unsigned int flags);
+    unsigned int flags);
 int X509_check_ip(X509 *x, const unsigned char *chk, size_t chklen,
-                  unsigned int flags);
+    unsigned int flags);
 int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags);
 
 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
 int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
-                             unsigned long chtype);
+    unsigned long chtype);
 
 void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
+/* clang-format off */
 {-
     generate_stack_macros("X509_POLICY_NODE");
 -}
-
+/* clang-format on */
 
 #ifndef OPENSSL_NO_RFC3779
 typedef struct ASRange_st {
     ASN1_INTEGER *min, *max;
 } ASRange;
 
-# define ASIdOrRange_id          0
-# define ASIdOrRange_range       1
+#define ASIdOrRange_id 0
+#define ASIdOrRange_range 1
 
 typedef struct ASIdOrRange_st {
     int type;
@@ -819,14 +841,16 @@ typedef struct ASIdOrRange_st {
     } u;
 } ASIdOrRange;
 
+/* clang-format off */
 {-
     generate_stack_macros("ASIdOrRange");
 -}
+/* clang-format on */
 
 typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
 
-# define ASIdentifierChoice_inherit              0
-# define ASIdentifierChoice_asIdsOrRanges        1
+#define ASIdentifierChoice_inherit 0
+#define ASIdentifierChoice_asIdsOrRanges 1
 
 typedef struct ASIdentifierChoice_st {
     int type;
@@ -849,8 +873,8 @@ typedef struct IPAddressRange_st {
     ASN1_BIT_STRING *min, *max;
 } IPAddressRange;
 
-# define IPAddressOrRange_addressPrefix  0
-# define IPAddressOrRange_addressRange   1
+#define IPAddressOrRange_addressPrefix 0
+#define IPAddressOrRange_addressRange 1
 
 typedef struct IPAddressOrRange_st {
     int type;
@@ -860,14 +884,16 @@ typedef struct IPAddressOrRange_st {
     } u;
 } IPAddressOrRange;
 
+/* clang-format off */
 {-
     generate_stack_macros("IPAddressOrRange");
 -}
+/* clang-format on */
 
 typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
 
-# define IPAddressChoice_inherit                 0
-# define IPAddressChoice_addressesOrRanges       1
+#define IPAddressChoice_inherit 0
+#define IPAddressChoice_addressesOrRanges 1
 
 typedef struct IPAddressChoice_st {
     int type;
@@ -882,10 +908,11 @@ typedef struct IPAddressFamily_st {
     IPAddressChoice *ipAddressChoice;
 } IPAddressFamily;
 
+/* clang-format off */
 {-
     generate_stack_macros("IPAddressFamily");
 -}
-
+/* clang-format on */
 
 typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
 
@@ -897,8 +924,8 @@ DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
 /*
  * API tag for elements of the ASIdentifer SEQUENCE.
  */
-# define V3_ASID_ASNUM   0
-# define V3_ASID_RDI     1
+#define V3_ASID_ASNUM 0
+#define V3_ASID_RDI 1
 
 /*
  * AFI values, assigned by IANA.  It'd be nice to make the AFI
@@ -906,8 +933,8 @@ DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
  * that would need to be defined for other address families for it to
  * be worth the trouble.
  */
-# define IANA_AFI_IPV4   1
-# define IANA_AFI_IPV6   2
+#define IANA_AFI_IPV4 1
+#define IANA_AFI_IPV6 2
 
 /*
  * Utilities to construct and extract values from RFC3779 extensions,
@@ -916,19 +943,19 @@ DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
  */
 int X509v3_asid_add_inherit(ASIdentifiers *asid, int which);
 int X509v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
-                                ASN1_INTEGER *min, ASN1_INTEGER *max);
+    ASN1_INTEGER *min, ASN1_INTEGER *max);
 int X509v3_addr_add_inherit(IPAddrBlocks *addr,
-                            const unsigned afi, const unsigned *safi);
+    const unsigned afi, const unsigned *safi);
 int X509v3_addr_add_prefix(IPAddrBlocks *addr,
-                           const unsigned afi, const unsigned *safi,
-                           unsigned char *a, const int prefixlen);
+    const unsigned afi, const unsigned *safi,
+    unsigned char *a, const int prefixlen);
 int X509v3_addr_add_range(IPAddrBlocks *addr,
-                          const unsigned afi, const unsigned *safi,
-                          unsigned char *min, unsigned char *max);
+    const unsigned afi, const unsigned *safi,
+    unsigned char *min, unsigned char *max);
 unsigned X509v3_addr_get_afi(const IPAddressFamily *f);
 int X509v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
-                          unsigned char *min, unsigned char *max,
-                          const int length);
+    unsigned char *min, unsigned char *max,
+    const int length);
 
 /*
  * Canonical forms.
@@ -952,16 +979,18 @@ int X509v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
 int X509v3_asid_validate_path(X509_STORE_CTX *);
 int X509v3_addr_validate_path(X509_STORE_CTX *);
 int X509v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-                                      ASIdentifiers *ext,
-                                      int allow_inheritance);
+    ASIdentifiers *ext,
+    int allow_inheritance);
 int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-                                      IPAddrBlocks *ext, int allow_inheritance);
+    IPAddrBlocks *ext, int allow_inheritance);
 
-#endif                         /* OPENSSL_NO_RFC3779 */
+#endif /* OPENSSL_NO_RFC3779 */
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_STRING");
 -}
+/* clang-format on */
 
 /*
  * Admission Syntax
@@ -974,10 +1003,12 @@ DECLARE_ASN1_FUNCTIONS(NAMING_AUTHORITY)
 DECLARE_ASN1_FUNCTIONS(PROFESSION_INFO)
 DECLARE_ASN1_FUNCTIONS(ADMISSIONS)
 DECLARE_ASN1_FUNCTIONS(ADMISSION_SYNTAX)
+/* clang-format off */
 {-
     generate_stack_macros("PROFESSION_INFO")
     .generate_stack_macros("ADMISSIONS");
 -}
+/* clang-format on */
 typedef STACK_OF(PROFESSION_INFO) PROFESSION_INFOS;
 
 const ASN1_OBJECT *NAMING_AUTHORITY_get0_authorityId(
@@ -987,11 +1018,11 @@ const ASN1_IA5STRING *NAMING_AUTHORITY_get0_authorityURL(
 const ASN1_STRING *NAMING_AUTHORITY_get0_authorityText(
     const NAMING_AUTHORITY *n);
 void NAMING_AUTHORITY_set0_authorityId(NAMING_AUTHORITY *n,
-    ASN1_OBJECT* namingAuthorityId);
+    ASN1_OBJECT *namingAuthorityId);
 void NAMING_AUTHORITY_set0_authorityURL(NAMING_AUTHORITY *n,
-    ASN1_IA5STRING* namingAuthorityUrl);
+    ASN1_IA5STRING *namingAuthorityUrl);
 void NAMING_AUTHORITY_set0_authorityText(NAMING_AUTHORITY *n,
-    ASN1_STRING* namingAuthorityText);
+    ASN1_STRING *namingAuthorityText);
 
 const GENERAL_NAME *ADMISSION_SYNTAX_get0_admissionAuthority(
     const ADMISSION_SYNTAX *as);
@@ -1036,9 +1067,11 @@ DECLARE_ASN1_FUNCTIONS(OSSL_ATTRIBUTES_SYNTAX)
 typedef STACK_OF(USERNOTICE) OSSL_USER_NOTICE_SYNTAX;
 DECLARE_ASN1_FUNCTIONS(OSSL_USER_NOTICE_SYNTAX)
 
+/* clang-format off */
 {-
     generate_stack_macros("USERNOTICE");
 -}
+/* clang-format on */
 
 typedef struct OSSL_ROLE_SPEC_CERT_ID_st {
     GENERAL_NAME *roleName;
@@ -1049,9 +1082,11 @@ typedef struct OSSL_ROLE_SPEC_CERT_ID_st {
 
 DECLARE_ASN1_FUNCTIONS(OSSL_ROLE_SPEC_CERT_ID)
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_ROLE_SPEC_CERT_ID");
 -}
+/* clang-format on */
 
 typedef STACK_OF(OSSL_ROLE_SPEC_CERT_ID) OSSL_ROLE_SPEC_CERT_ID_SYNTAX;
 
@@ -1066,8 +1101,8 @@ typedef struct OSSL_INFO_SYNTAX_POINTER_st {
     OSSL_HASH *hash;
 } OSSL_INFO_SYNTAX_POINTER;
 
-# define OSSL_INFO_SYNTAX_TYPE_CONTENT 0
-# define OSSL_INFO_SYNTAX_TYPE_POINTER 1
+#define OSSL_INFO_SYNTAX_TYPE_CONTENT 0
+#define OSSL_INFO_SYNTAX_TYPE_POINTER 1
 
 typedef struct OSSL_INFO_SYNTAX_st {
     int type;
@@ -1112,22 +1147,22 @@ typedef struct OSSL_DAY_TIME_BAND_st {
     OSSL_DAY_TIME *endDayTime;
 } OSSL_DAY_TIME_BAND;
 
-# define OSSL_NAMED_DAY_TYPE_INT 0
-# define OSSL_NAMED_DAY_TYPE_BIT 1
-# define OSSL_NAMED_DAY_INT_SUN 1
-# define OSSL_NAMED_DAY_INT_MON 2
-# define OSSL_NAMED_DAY_INT_TUE 3
-# define OSSL_NAMED_DAY_INT_WED 4
-# define OSSL_NAMED_DAY_INT_THU 5
-# define OSSL_NAMED_DAY_INT_FRI 6
-# define OSSL_NAMED_DAY_INT_SAT 7
-# define OSSL_NAMED_DAY_BIT_SUN 0
-# define OSSL_NAMED_DAY_BIT_MON 1
-# define OSSL_NAMED_DAY_BIT_TUE 2
-# define OSSL_NAMED_DAY_BIT_WED 3
-# define OSSL_NAMED_DAY_BIT_THU 4
-# define OSSL_NAMED_DAY_BIT_FRI 5
-# define OSSL_NAMED_DAY_BIT_SAT 6
+#define OSSL_NAMED_DAY_TYPE_INT 0
+#define OSSL_NAMED_DAY_TYPE_BIT 1
+#define OSSL_NAMED_DAY_INT_SUN 1
+#define OSSL_NAMED_DAY_INT_MON 2
+#define OSSL_NAMED_DAY_INT_TUE 3
+#define OSSL_NAMED_DAY_INT_WED 4
+#define OSSL_NAMED_DAY_INT_THU 5
+#define OSSL_NAMED_DAY_INT_FRI 6
+#define OSSL_NAMED_DAY_INT_SAT 7
+#define OSSL_NAMED_DAY_BIT_SUN 0
+#define OSSL_NAMED_DAY_BIT_MON 1
+#define OSSL_NAMED_DAY_BIT_TUE 2
+#define OSSL_NAMED_DAY_BIT_WED 3
+#define OSSL_NAMED_DAY_BIT_THU 4
+#define OSSL_NAMED_DAY_BIT_FRI 5
+#define OSSL_NAMED_DAY_BIT_SAT 6
 
 typedef struct OSSL_NAMED_DAY_st {
     int type;
@@ -1137,11 +1172,11 @@ typedef struct OSSL_NAMED_DAY_st {
     } choice;
 } OSSL_NAMED_DAY;
 
-# define OSSL_TIME_SPEC_X_DAY_OF_FIRST 0
-# define OSSL_TIME_SPEC_X_DAY_OF_SECOND 1
-# define OSSL_TIME_SPEC_X_DAY_OF_THIRD 2
-# define OSSL_TIME_SPEC_X_DAY_OF_FOURTH 3
-# define OSSL_TIME_SPEC_X_DAY_OF_FIFTH 4
+#define OSSL_TIME_SPEC_X_DAY_OF_FIRST 0
+#define OSSL_TIME_SPEC_X_DAY_OF_SECOND 1
+#define OSSL_TIME_SPEC_X_DAY_OF_THIRD 2
+#define OSSL_TIME_SPEC_X_DAY_OF_FOURTH 3
+#define OSSL_TIME_SPEC_X_DAY_OF_FIFTH 4
 
 typedef struct OSSL_TIME_SPEC_X_DAY_OF_st {
     int type;
@@ -1154,23 +1189,23 @@ typedef struct OSSL_TIME_SPEC_X_DAY_OF_st {
     } choice;
 } OSSL_TIME_SPEC_X_DAY_OF;
 
-# define OSSL_TIME_SPEC_DAY_TYPE_INT 0
-# define OSSL_TIME_SPEC_DAY_TYPE_BIT 1
-# define OSSL_TIME_SPEC_DAY_TYPE_DAY_OF 2
-# define OSSL_TIME_SPEC_DAY_BIT_SUN 0
-# define OSSL_TIME_SPEC_DAY_BIT_MON 1
-# define OSSL_TIME_SPEC_DAY_BIT_TUE 2
-# define OSSL_TIME_SPEC_DAY_BIT_WED 3
-# define OSSL_TIME_SPEC_DAY_BIT_THU 4
-# define OSSL_TIME_SPEC_DAY_BIT_FRI 5
-# define OSSL_TIME_SPEC_DAY_BIT_SAT 6
-# define OSSL_TIME_SPEC_DAY_INT_SUN 1
-# define OSSL_TIME_SPEC_DAY_INT_MON 2
-# define OSSL_TIME_SPEC_DAY_INT_TUE 3
-# define OSSL_TIME_SPEC_DAY_INT_WED 4
-# define OSSL_TIME_SPEC_DAY_INT_THU 5
-# define OSSL_TIME_SPEC_DAY_INT_FRI 6
-# define OSSL_TIME_SPEC_DAY_INT_SAT 7
+#define OSSL_TIME_SPEC_DAY_TYPE_INT 0
+#define OSSL_TIME_SPEC_DAY_TYPE_BIT 1
+#define OSSL_TIME_SPEC_DAY_TYPE_DAY_OF 2
+#define OSSL_TIME_SPEC_DAY_BIT_SUN 0
+#define OSSL_TIME_SPEC_DAY_BIT_MON 1
+#define OSSL_TIME_SPEC_DAY_BIT_TUE 2
+#define OSSL_TIME_SPEC_DAY_BIT_WED 3
+#define OSSL_TIME_SPEC_DAY_BIT_THU 4
+#define OSSL_TIME_SPEC_DAY_BIT_FRI 5
+#define OSSL_TIME_SPEC_DAY_BIT_SAT 6
+#define OSSL_TIME_SPEC_DAY_INT_SUN 1
+#define OSSL_TIME_SPEC_DAY_INT_MON 2
+#define OSSL_TIME_SPEC_DAY_INT_TUE 3
+#define OSSL_TIME_SPEC_DAY_INT_WED 4
+#define OSSL_TIME_SPEC_DAY_INT_THU 5
+#define OSSL_TIME_SPEC_DAY_INT_FRI 6
+#define OSSL_TIME_SPEC_DAY_INT_SAT 7
 
 typedef struct OSSL_TIME_SPEC_DAY_st {
     int type;
@@ -1181,14 +1216,14 @@ typedef struct OSSL_TIME_SPEC_DAY_st {
     } choice;
 } OSSL_TIME_SPEC_DAY;
 
-# define OSSL_TIME_SPEC_WEEKS_TYPE_ALL 0
-# define OSSL_TIME_SPEC_WEEKS_TYPE_INT 1
-# define OSSL_TIME_SPEC_WEEKS_TYPE_BIT 2
-# define OSSL_TIME_SPEC_BIT_WEEKS_1 0
-# define OSSL_TIME_SPEC_BIT_WEEKS_2 1
-# define OSSL_TIME_SPEC_BIT_WEEKS_3 2
-# define OSSL_TIME_SPEC_BIT_WEEKS_4 3
-# define OSSL_TIME_SPEC_BIT_WEEKS_5 4
+#define OSSL_TIME_SPEC_WEEKS_TYPE_ALL 0
+#define OSSL_TIME_SPEC_WEEKS_TYPE_INT 1
+#define OSSL_TIME_SPEC_WEEKS_TYPE_BIT 2
+#define OSSL_TIME_SPEC_BIT_WEEKS_1 0
+#define OSSL_TIME_SPEC_BIT_WEEKS_2 1
+#define OSSL_TIME_SPEC_BIT_WEEKS_3 2
+#define OSSL_TIME_SPEC_BIT_WEEKS_4 3
+#define OSSL_TIME_SPEC_BIT_WEEKS_5 4
 
 typedef struct OSSL_TIME_SPEC_WEEKS_st {
     int type;
@@ -1199,33 +1234,33 @@ typedef struct OSSL_TIME_SPEC_WEEKS_st {
     } choice;
 } OSSL_TIME_SPEC_WEEKS;
 
-# define OSSL_TIME_SPEC_MONTH_TYPE_ALL 0
-# define OSSL_TIME_SPEC_MONTH_TYPE_INT 1
-# define OSSL_TIME_SPEC_MONTH_TYPE_BIT 2
-# define OSSL_TIME_SPEC_INT_MONTH_JAN 1
-# define OSSL_TIME_SPEC_INT_MONTH_FEB 2
-# define OSSL_TIME_SPEC_INT_MONTH_MAR 3
-# define OSSL_TIME_SPEC_INT_MONTH_APR 4
-# define OSSL_TIME_SPEC_INT_MONTH_MAY 5
-# define OSSL_TIME_SPEC_INT_MONTH_JUN 6
-# define OSSL_TIME_SPEC_INT_MONTH_JUL 7
-# define OSSL_TIME_SPEC_INT_MONTH_AUG 8
-# define OSSL_TIME_SPEC_INT_MONTH_SEP 9
-# define OSSL_TIME_SPEC_INT_MONTH_OCT 10
-# define OSSL_TIME_SPEC_INT_MONTH_NOV 11
-# define OSSL_TIME_SPEC_INT_MONTH_DEC 12
-# define OSSL_TIME_SPEC_BIT_MONTH_JAN 0
-# define OSSL_TIME_SPEC_BIT_MONTH_FEB 1
-# define OSSL_TIME_SPEC_BIT_MONTH_MAR 2
-# define OSSL_TIME_SPEC_BIT_MONTH_APR 3
-# define OSSL_TIME_SPEC_BIT_MONTH_MAY 4
-# define OSSL_TIME_SPEC_BIT_MONTH_JUN 5
-# define OSSL_TIME_SPEC_BIT_MONTH_JUL 6
-# define OSSL_TIME_SPEC_BIT_MONTH_AUG 7
-# define OSSL_TIME_SPEC_BIT_MONTH_SEP 8
-# define OSSL_TIME_SPEC_BIT_MONTH_OCT 9
-# define OSSL_TIME_SPEC_BIT_MONTH_NOV 10
-# define OSSL_TIME_SPEC_BIT_MONTH_DEC 11
+#define OSSL_TIME_SPEC_MONTH_TYPE_ALL 0
+#define OSSL_TIME_SPEC_MONTH_TYPE_INT 1
+#define OSSL_TIME_SPEC_MONTH_TYPE_BIT 2
+#define OSSL_TIME_SPEC_INT_MONTH_JAN 1
+#define OSSL_TIME_SPEC_INT_MONTH_FEB 2
+#define OSSL_TIME_SPEC_INT_MONTH_MAR 3
+#define OSSL_TIME_SPEC_INT_MONTH_APR 4
+#define OSSL_TIME_SPEC_INT_MONTH_MAY 5
+#define OSSL_TIME_SPEC_INT_MONTH_JUN 6
+#define OSSL_TIME_SPEC_INT_MONTH_JUL 7
+#define OSSL_TIME_SPEC_INT_MONTH_AUG 8
+#define OSSL_TIME_SPEC_INT_MONTH_SEP 9
+#define OSSL_TIME_SPEC_INT_MONTH_OCT 10
+#define OSSL_TIME_SPEC_INT_MONTH_NOV 11
+#define OSSL_TIME_SPEC_INT_MONTH_DEC 12
+#define OSSL_TIME_SPEC_BIT_MONTH_JAN 0
+#define OSSL_TIME_SPEC_BIT_MONTH_FEB 1
+#define OSSL_TIME_SPEC_BIT_MONTH_MAR 2
+#define OSSL_TIME_SPEC_BIT_MONTH_APR 3
+#define OSSL_TIME_SPEC_BIT_MONTH_MAY 4
+#define OSSL_TIME_SPEC_BIT_MONTH_JUN 5
+#define OSSL_TIME_SPEC_BIT_MONTH_JUL 6
+#define OSSL_TIME_SPEC_BIT_MONTH_AUG 7
+#define OSSL_TIME_SPEC_BIT_MONTH_SEP 8
+#define OSSL_TIME_SPEC_BIT_MONTH_OCT 9
+#define OSSL_TIME_SPEC_BIT_MONTH_NOV 10
+#define OSSL_TIME_SPEC_BIT_MONTH_DEC 11
 
 typedef struct OSSL_TIME_SPEC_MONTH_st {
     int type;
@@ -1244,8 +1279,8 @@ typedef struct OSSL_TIME_PERIOD_st {
     STACK_OF(ASN1_INTEGER) *years;
 } OSSL_TIME_PERIOD;
 
-# define OSSL_TIME_SPEC_TIME_TYPE_ABSOLUTE 0
-# define OSSL_TIME_SPEC_TIME_TYPE_PERIODIC 1
+#define OSSL_TIME_SPEC_TIME_TYPE_ABSOLUTE 0
+#define OSSL_TIME_SPEC_TIME_TYPE_PERIODIC 1
 
 typedef struct OSSL_TIME_SPEC_TIME_st {
     int type;
@@ -1273,13 +1308,17 @@ DECLARE_ASN1_FUNCTIONS(OSSL_TIME_SPEC_TIME)
 DECLARE_ASN1_FUNCTIONS(OSSL_TIME_SPEC)
 DECLARE_ASN1_FUNCTIONS(OSSL_TIME_PERIOD)
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_TIME_PERIOD");
 -}
+/* clang-format on */
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_DAY_TIME_BAND");
 -}
+/* clang-format on */
 
 /* Attribute Type and Value */
 typedef struct atav_st {
@@ -1297,8 +1336,8 @@ typedef struct ATTRIBUTE_VALUE_MAPPING_st {
     OSSL_ATAV *remote;
 } OSSL_ATTRIBUTE_VALUE_MAPPING;
 
-# define OSSL_ATTR_MAP_TYPE   0
-# define OSSL_ATTR_MAP_VALUE  1
+#define OSSL_ATTR_MAP_TYPE 0
+#define OSSL_ATTR_MAP_VALUE 1
 
 typedef struct ATTRIBUTE_MAPPING_st {
     int type;
@@ -1315,12 +1354,14 @@ DECLARE_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_VALUE_MAPPING)
 DECLARE_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_MAPPING)
 DECLARE_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_MAPPINGS)
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_ATTRIBUTE_MAPPING");
 -}
+/* clang-format on */
 
-# define OSSL_AAA_ATTRIBUTE_TYPE     0
-# define OSSL_AAA_ATTRIBUTE_VALUES   1
+#define OSSL_AAA_ATTRIBUTE_TYPE 0
+#define OSSL_AAA_ATTRIBUTE_VALUES 1
 
 typedef struct ALLOWED_ATTRIBUTES_CHOICE_st {
     int type;
@@ -1341,13 +1382,17 @@ DECLARE_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_CHOICE)
 DECLARE_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_ITEM)
 DECLARE_ASN1_FUNCTIONS(OSSL_ALLOWED_ATTRIBUTES_SYNTAX)
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_ALLOWED_ATTRIBUTES_CHOICE");
 -}
+/* clang-format on */
 
+/* clang-format off */
 {-
     generate_stack_macros("OSSL_ALLOWED_ATTRIBUTES_ITEM");
 -}
+/* clang-format on */
 
 typedef struct AA_DIST_POINT_st {
     DIST_POINT_NAME *distpoint;
@@ -1361,7 +1406,7 @@ typedef struct AA_DIST_POINT_st {
 
 DECLARE_ASN1_FUNCTIONS(OSSL_AA_DIST_POINT)
 
-# ifdef  __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 #endif
diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h
index 4bbcfc230237..19f938626bd8 100644
--- a/include/openssl/x509v3err.h
+++ b/include/openssl/x509v3err.h
@@ -9,89 +9,87 @@
  */
 
 #ifndef OPENSSL_X509V3ERR_H
-# define OPENSSL_X509V3ERR_H
-# pragma once
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# include <openssl/cryptoerr_legacy.h>
-
+#define OPENSSL_X509V3ERR_H
+#pragma once
 
+#include <openssl/opensslconf.h>
+#include <openssl/symhacks.h>
+#include <openssl/cryptoerr_legacy.h>
 
 /*
  * X509V3 reason codes.
  */
-# define X509V3_R_BAD_IP_ADDRESS                          118
-# define X509V3_R_BAD_OBJECT                              119
-# define X509V3_R_BAD_OPTION                              170
-# define X509V3_R_BAD_VALUE                               171
-# define X509V3_R_BN_DEC2BN_ERROR                         100
-# define X509V3_R_BN_TO_ASN1_INTEGER_ERROR                101
-# define X509V3_R_DIRNAME_ERROR                           149
-# define X509V3_R_DISTPOINT_ALREADY_SET                   160
-# define X509V3_R_DUPLICATE_ZONE_ID                       133
-# define X509V3_R_EMPTY_KEY_USAGE                         169
-# define X509V3_R_ERROR_CONVERTING_ZONE                   131
-# define X509V3_R_ERROR_CREATING_EXTENSION                144
-# define X509V3_R_ERROR_IN_EXTENSION                      128
-# define X509V3_R_EXPECTED_A_SECTION_NAME                 137
-# define X509V3_R_EXTENSION_EXISTS                        145
-# define X509V3_R_EXTENSION_NAME_ERROR                    115
-# define X509V3_R_EXTENSION_NOT_FOUND                     102
-# define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED         103
-# define X509V3_R_EXTENSION_VALUE_ERROR                   116
-# define X509V3_R_ILLEGAL_EMPTY_EXTENSION                 151
-# define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG             152
-# define X509V3_R_INVALID_ASNUMBER                        162
-# define X509V3_R_INVALID_ASRANGE                         163
-# define X509V3_R_INVALID_BOOLEAN_STRING                  104
-# define X509V3_R_INVALID_CERTIFICATE                     158
-# define X509V3_R_INVALID_EMPTY_NAME                      108
-# define X509V3_R_INVALID_EXTENSION_STRING                105
-# define X509V3_R_INVALID_INHERITANCE                     165
-# define X509V3_R_INVALID_IPADDRESS                       166
-# define X509V3_R_INVALID_MULTIPLE_RDNS                   161
-# define X509V3_R_INVALID_NAME                            106
-# define X509V3_R_INVALID_NULL_ARGUMENT                   107
-# define X509V3_R_INVALID_NULL_VALUE                      109
-# define X509V3_R_INVALID_NUMBER                          140
-# define X509V3_R_INVALID_NUMBERS                         141
-# define X509V3_R_INVALID_OBJECT_IDENTIFIER               110
-# define X509V3_R_INVALID_OPTION                          138
-# define X509V3_R_INVALID_POLICY_IDENTIFIER               134
-# define X509V3_R_INVALID_PROXY_POLICY_SETTING            153
-# define X509V3_R_INVALID_PURPOSE                         146
-# define X509V3_R_INVALID_SAFI                            164
-# define X509V3_R_INVALID_SECTION                         135
-# define X509V3_R_INVALID_SYNTAX                          143
-# define X509V3_R_ISSUER_DECODE_ERROR                     126
-# define X509V3_R_MISSING_VALUE                           124
-# define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS           142
-# define X509V3_R_NEGATIVE_PATHLEN                        168
-# define X509V3_R_NO_CONFIG_DATABASE                      136
-# define X509V3_R_NO_ISSUER_CERTIFICATE                   121
-# define X509V3_R_NO_ISSUER_DETAILS                       127
-# define X509V3_R_NO_POLICY_IDENTIFIER                    139
-# define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED   154
-# define X509V3_R_NO_PUBLIC_KEY                           114
-# define X509V3_R_NO_SUBJECT_DETAILS                      125
-# define X509V3_R_OPERATION_NOT_DEFINED                   148
-# define X509V3_R_OTHERNAME_ERROR                         147
-# define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED         155
-# define X509V3_R_POLICY_PATH_LENGTH                      156
-# define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED      157
-# define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
-# define X509V3_R_PURPOSE_NOT_UNIQUE                      173
-# define X509V3_R_SECTION_NOT_FOUND                       150
-# define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS            122
-# define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID              123
-# define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT             111
-# define X509V3_R_UNKNOWN_EXTENSION                       129
-# define X509V3_R_UNKNOWN_EXTENSION_NAME                  130
-# define X509V3_R_UNKNOWN_OPTION                          120
-# define X509V3_R_UNKNOWN_VALUE                           172
-# define X509V3_R_UNSUPPORTED_OPTION                      117
-# define X509V3_R_UNSUPPORTED_TYPE                        167
-# define X509V3_R_USER_TOO_LONG                           132
+#define X509V3_R_BAD_IP_ADDRESS 118
+#define X509V3_R_BAD_OBJECT 119
+#define X509V3_R_BAD_OPTION 170
+#define X509V3_R_BAD_VALUE 171
+#define X509V3_R_BN_DEC2BN_ERROR 100
+#define X509V3_R_BN_TO_ASN1_INTEGER_ERROR 101
+#define X509V3_R_DIRNAME_ERROR 149
+#define X509V3_R_DISTPOINT_ALREADY_SET 160
+#define X509V3_R_DUPLICATE_ZONE_ID 133
+#define X509V3_R_EMPTY_KEY_USAGE 169
+#define X509V3_R_ERROR_CONVERTING_ZONE 131
+#define X509V3_R_ERROR_CREATING_EXTENSION 144
+#define X509V3_R_ERROR_IN_EXTENSION 128
+#define X509V3_R_EXPECTED_A_SECTION_NAME 137
+#define X509V3_R_EXTENSION_EXISTS 145
+#define X509V3_R_EXTENSION_NAME_ERROR 115
+#define X509V3_R_EXTENSION_NOT_FOUND 102
+#define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED 103
+#define X509V3_R_EXTENSION_VALUE_ERROR 116
+#define X509V3_R_ILLEGAL_EMPTY_EXTENSION 151
+#define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG 152
+#define X509V3_R_INVALID_ASNUMBER 162
+#define X509V3_R_INVALID_ASRANGE 163
+#define X509V3_R_INVALID_BOOLEAN_STRING 104
+#define X509V3_R_INVALID_CERTIFICATE 158
+#define X509V3_R_INVALID_EMPTY_NAME 108
+#define X509V3_R_INVALID_EXTENSION_STRING 105
+#define X509V3_R_INVALID_INHERITANCE 165
+#define X509V3_R_INVALID_IPADDRESS 166
+#define X509V3_R_INVALID_MULTIPLE_RDNS 161
+#define X509V3_R_INVALID_NAME 106
+#define X509V3_R_INVALID_NULL_ARGUMENT 107
+#define X509V3_R_INVALID_NULL_VALUE 109
+#define X509V3_R_INVALID_NUMBER 140
+#define X509V3_R_INVALID_NUMBERS 141
+#define X509V3_R_INVALID_OBJECT_IDENTIFIER 110
+#define X509V3_R_INVALID_OPTION 138
+#define X509V3_R_INVALID_POLICY_IDENTIFIER 134
+#define X509V3_R_INVALID_PROXY_POLICY_SETTING 153
+#define X509V3_R_INVALID_PURPOSE 146
+#define X509V3_R_INVALID_SAFI 164
+#define X509V3_R_INVALID_SECTION 135
+#define X509V3_R_INVALID_SYNTAX 143
+#define X509V3_R_ISSUER_DECODE_ERROR 126
+#define X509V3_R_MISSING_VALUE 124
+#define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS 142
+#define X509V3_R_NEGATIVE_PATHLEN 168
+#define X509V3_R_NO_CONFIG_DATABASE 136
+#define X509V3_R_NO_ISSUER_CERTIFICATE 121
+#define X509V3_R_NO_ISSUER_DETAILS 127
+#define X509V3_R_NO_POLICY_IDENTIFIER 139
+#define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED 154
+#define X509V3_R_NO_PUBLIC_KEY 114
+#define X509V3_R_NO_SUBJECT_DETAILS 125
+#define X509V3_R_OPERATION_NOT_DEFINED 148
+#define X509V3_R_OTHERNAME_ERROR 147
+#define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED 155
+#define X509V3_R_POLICY_PATH_LENGTH 156
+#define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED 157
+#define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
+#define X509V3_R_PURPOSE_NOT_UNIQUE 173
+#define X509V3_R_SECTION_NOT_FOUND 150
+#define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS 122
+#define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID 123
+#define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT 111
+#define X509V3_R_UNKNOWN_EXTENSION 129
+#define X509V3_R_UNKNOWN_EXTENSION_NAME 130
+#define X509V3_R_UNKNOWN_OPTION 120
+#define X509V3_R_UNKNOWN_VALUE 172
+#define X509V3_R_UNSUPPORTED_OPTION 117
+#define X509V3_R_UNSUPPORTED_TYPE 167
+#define X509V3_R_USER_TOO_LONG 132
 
 #endif