From: Bob Beck <beck@openssl.org>
Date: Tue, 9 Dec 2025 07:05:43 +0000 (-0700)
Subject: 4.0-PRE-CLANG-FORMAT-WEBKIT
X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a7e5ea1e51f58180cd7aa4028e998949a36d66;p=thirdparty%2Fopenssl.git

4.0-PRE-CLANG-FORMAT-WEBKIT

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29242)
---

diff --git a/include/crypto/dso_conf.h.in b/include/crypto/dso_conf.h.in
index 12de11ade8d..7a35ad238b1 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.
  *
@@ -12,6 +14,7 @@
 # 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/openssl/asn1.h.in b/include/openssl/asn1.h.in
index e25fd1c9c3a..be2b66a354b 100644
--- a/include/openssl/asn1.h.in
+++ b/include/openssl/asn1.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -130,9 +132,11 @@ extern "C" {
 # 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 */
@@ -208,9 +212,11 @@ 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 RFC 5280 */
 
@@ -505,9 +511,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;
 
@@ -561,9 +569,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)
 
@@ -600,9 +610,11 @@ 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);
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_INTEGER");
 -}
+/* clang-format on */
 
 
 DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
@@ -638,9 +650,11 @@ int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
 int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data,
                           int len);
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_UTF8STRING");
 -}
+/* clang-format on */
 
 DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
 DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
@@ -651,9 +665,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)
 
diff --git a/include/openssl/asn1t.h.in b/include/openssl/asn1t.h.in
index b536fe51a20..4bf2bf7dbd6 100644
--- a/include/openssl/asn1t.h.in
+++ b/include/openssl/asn1t.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -895,9 +897,11 @@ DECLARE_ASN1_ITEM(LONG)
 DECLARE_ASN1_ITEM(ZLONG)
 # endif
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_VALUE");
 -}
+/* clang-format on */
 
 
 /* Functions used internally by the ASN1 code */
diff --git a/include/openssl/bio.h.in b/include/openssl/bio.h.in
index 228e00e0a6d..d5e760889b5 100644
--- a/include/openssl/bio.h.in
+++ b/include/openssl/bio.h.in
@@ -8,9 +8,11 @@
  * 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
@@ -334,9 +336,11 @@ int BIO_method_type(const BIO *b);
 typedef int BIO_info_cb(BIO *, int, int);
 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 */
diff --git a/include/openssl/cmp.h.in b/include/openssl/cmp.h.in
index d659331fa38..e8e0dc94707 100644
--- a/include/openssl/cmp.h.in
+++ b/include/openssl/cmp.h.in
@@ -11,9 +11,11 @@
  * 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
@@ -220,19 +222,25 @@ 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
@@ -248,19 +256,25 @@ 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;
 
 /*
diff --git a/include/openssl/cms.h.in b/include/openssl/cms.h.in
index c681d412035..869cab45bc5 100644
--- a/include/openssl/cms.h.in
+++ b/include/openssl/cms.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -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)
diff --git a/include/openssl/comp.h.in b/include/openssl/comp.h.in
index bd1efdc568e..5b026b2a8d0 100644
--- a/include/openssl/comp.h.in
+++ b/include/openssl/comp.h.in
@@ -7,9 +7,11 @@
  * 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
@@ -65,9 +67,11 @@ const BIO_METHOD *BIO_f_zstd(void);
 
 typedef struct ssl_comp_st SSL_COMP;
 
+/* clang-format off */
 {-
     generate_stack_macros("SSL_COMP");
 -}
+/* clang-format on */
 
 
 # ifdef  __cplusplus
diff --git a/include/openssl/conf.h.in b/include/openssl/conf.h.in
index 5663287089c..5e2f4389c20 100644
--- a/include/openssl/conf.h.in
+++ b/include/openssl/conf.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -42,10 +44,12 @@ 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;
diff --git a/include/openssl/configuration.h.in b/include/openssl/configuration.h.in
index aeac5106f32..b22fc904896 100644
--- a/include/openssl/configuration.h.in
+++ b/include/openssl/configuration.h.in
@@ -25,6 +25,7 @@ extern "C" {
  * OpenSSL was configured with the following options:
  */
 
+/* clang-format off */
 {- if (@{$config{openssl_sys_defines}}) {
       foreach (@{$config{openssl_sys_defines}}) {
         $OUT .= "# ifndef $_\n";
@@ -45,9 +46,12 @@ extern "C" {
     }
     "";
 -}
+/* clang-format on */
 
 /* Generate 80386 code? */
+/* clang-format off */
 {- $config{processor} eq "386" ? "# define" : "# undef" -} I386_ONLY
+/* clang-format on */
 
 /*
  * The UEFI build supports both 32-bit and 64-bit builds from a single run
@@ -56,17 +60,27 @@ extern "C" {
  * them in that case.
  */
 # if !defined(OPENSSL_SYS_UEFI)
+/* clang-format off */
 {- $config{bn_ll} ? "#  define" : "#  undef" -} BN_LLONG
+/* 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
+/* clang-format on */
 # endif
 
 /*
  * The following are cipher-specific, but are part of the public API.
  */
+/* 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
diff --git a/include/openssl/core_names.h.in b/include/openssl/core_names.h.in
index 77e0e3f59a4..964fc1744e4 100644
--- a/include/openssl/core_names.h.in
+++ b/include/openssl/core_names.h.in
@@ -8,9 +8,11 @@
  * 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
@@ -117,7 +119,9 @@ extern "C" {
 #define OSSL_KEM_PARAM_OPERATION_DHKEM      "DHKEM"
 
 /* Parameter name definitions - generated by util/perl/OpenSSL/paramnames.pm */
+/* clang-format off */
 {- generate_public_macros(); -}
+/* clang-format on */
 
 # ifdef __cplusplus
 }
diff --git a/include/openssl/crmf.h.in b/include/openssl/crmf.h.in
index 3fab255a3fd..8277e8584de 100644
--- a/include/openssl/crmf.h.in
+++ b/include/openssl/crmf.h.in
@@ -13,9 +13,11 @@
  * 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
@@ -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)
diff --git a/include/openssl/crypto.h.in b/include/openssl/crypto.h.in
index 0d9852cd9a9..9551bc5fcdc 100644
--- a/include/openssl/crypto.h.in
+++ b/include/openssl/crypto.h.in
@@ -10,9 +10,11 @@
  * 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
@@ -211,9 +213,11 @@ struct crypto_ex_data_st {
     STACK_OF(void) *sk;
 };
 
+/* clang-format off */
 {-
     generate_stack_macros("void");
 -}
+/* clang-format on */
 
 
 /*
diff --git a/include/openssl/ct.h.in b/include/openssl/ct.h.in
index 3fc2aaa9427..1273e8b3885 100644
--- a/include/openssl/ct.h.in
+++ b/include/openssl/ct.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -40,10 +42,12 @@ extern "C" {
 /* All hashes are SHA256 in v1 of Certificate Transparency */
 # define CT_V1_HASHLEN SHA256_DIGEST_LENGTH
 
+/* clang-format off */
 {-
     generate_stack_macros("SCT")
     .generate_stack_macros("CTLOG");
 -}
+/* clang-format on */
 
 
 typedef enum {
diff --git a/include/openssl/err.h.in b/include/openssl/err.h.in
index 9143704c098..b58f21b4f03 100644
--- a/include/openssl/err.h.in
+++ b/include/openssl/err.h.in
@@ -7,9 +7,11 @@
  * 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
@@ -373,9 +375,11 @@ typedef struct ERR_string_data_st {
     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
diff --git a/include/openssl/ess.h.in b/include/openssl/ess.h.in
index d1a685b98e3..0478522c507 100644
--- a/include/openssl/ess.h.in
+++ b/include/openssl/ess.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -32,17 +34,21 @@ 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)
diff --git a/include/openssl/fipskey.h.in b/include/openssl/fipskey.h.in
index c53012a8621..7bfa1d2bde5 100644
--- a/include/openssl/fipskey.h.in
+++ b/include/openssl/fipskey.h.in
@@ -20,18 +20,24 @@ extern "C" {
 /*
  * 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
 }
diff --git a/include/openssl/lhash.h.in b/include/openssl/lhash.h.in
index 63a9c53bfaf..73b3656f195 100644
--- a/include/openssl/lhash.h.in
+++ b/include/openssl/lhash.h.in
@@ -7,9 +7,11 @@
  * 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
@@ -361,10 +363,12 @@ OSSL_DEPRECATEDIN_3_1 void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *
     } \
     LHASH_OF(type)
 
+/* clang-format off */
 {-
     generate_lhash_macros("OPENSSL_STRING")
     .generate_lhash_macros("OPENSSL_CSTRING");
 -}
+/* clang-format on */
 
 #ifdef  __cplusplus
 }
diff --git a/include/openssl/ocsp.h.in b/include/openssl/ocsp.h.in
index 0481e11951d..332367908a4 100644
--- a/include/openssl/ocsp.h.in
+++ b/include/openssl/ocsp.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -93,10 +95,12 @@ 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
@@ -110,9 +114,11 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES;
 #  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;
 
@@ -123,9 +129,11 @@ typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO;
 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;
 
diff --git a/include/openssl/opensslv.h.in b/include/openssl/opensslv.h.in
index 69b9caacf4d..8da01a340d8 100644
--- a/include/openssl/opensslv.h.in
+++ b/include/openssl/opensslv.h.in
@@ -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,7 +66,9 @@ 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
@@ -73,28 +85,38 @@ 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
 }
diff --git a/include/openssl/pkcs12.h.in b/include/openssl/pkcs12.h.in
index fcc432fca07..6c3088694b6 100644
--- a/include/openssl/pkcs12.h.in
+++ b/include/openssl/pkcs12.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -69,9 +71,11 @@ 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;
 
diff --git a/include/openssl/pkcs7.h.in b/include/openssl/pkcs7.h.in
index 57e45dc2fb6..e6055ce32b9 100644
--- a/include/openssl/pkcs7.h.in
+++ b/include/openssl/pkcs7.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -67,9 +69,11 @@ 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 */
@@ -79,9 +83,11 @@ typedef struct pkcs7_recip_info_st {
     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 {
@@ -170,9 +176,11 @@ 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
diff --git a/include/openssl/safestack.h.in b/include/openssl/safestack.h.in
index 031029521ef..f3ea184efdb 100644
--- a/include/openssl/safestack.h.in
+++ b/include/openssl/safestack.h.in
@@ -9,11 +9,13 @@
  * 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
@@ -229,10 +231,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)
 /*
@@ -240,9 +244,11 @@ 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
diff --git a/include/openssl/srp.h.in b/include/openssl/srp.h.in
index dfbe845b838..6da2f8db213 100644
--- a/include/openssl/srp.h.in
+++ b/include/openssl/srp.h.in
@@ -13,9 +13,11 @@
  * 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
@@ -45,9 +47,11 @@ 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 {
@@ -61,9 +65,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);
@@ -96,9 +102,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
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index ca2fc953d86..83964e1324f 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -11,9 +11,11 @@
  * 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
@@ -244,9 +246,11 @@ 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,
@@ -972,9 +976,11 @@ 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)))
diff --git a/include/openssl/ui.h.in b/include/openssl/ui.h.in
index eb9a580fa8f..e52a35d3e85 100644
--- a/include/openssl/ui.h.in
+++ b/include/openssl/ui.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -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
diff --git a/include/openssl/x509.h.in b/include/openssl/x509.h.in
index c5b8525e125..0e83e5bbdc6 100644
--- a/include/openssl/x509.h.in
+++ b/include/openssl/x509.h.in
@@ -10,9 +10,11 @@
  * 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
@@ -50,12 +52,14 @@ 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 */
@@ -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
 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;
@@ -225,9 +235,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
diff --git a/include/openssl/x509_acert.h.in b/include/openssl/x509_acert.h.in
index bf4395eec6a..7df363ac2cd 100644
--- a/include/openssl/x509_acert.h.in
+++ b/include/openssl/x509_acert.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -133,9 +135,11 @@ int OSSL_ISSUER_SERIAL_set1_issuerUID(OSSL_ISSUER_SERIAL *isss,
 
 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)
@@ -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 52ff2607b6c..6e200a4e6ad 100644
--- a/include/openssl/x509_vfy.h.in
+++ b/include/openssl/x509_vfy.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -68,11 +70,13 @@ typedef enum {
 #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 {
@@ -83,9 +87,11 @@ typedef struct x509_trust_st {
     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 */
diff --git a/include/openssl/x509v3.h.in b/include/openssl/x509v3.h.in
index baf8b5ab1cf..bcf3dbb5f68 100644
--- a/include/openssl/x509v3.h.in
+++ b/include/openssl/x509v3.h.in
@@ -9,9 +9,11 @@
  * 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
@@ -110,9 +112,11 @@ struct v3_ext_ctx {
 
 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
@@ -185,19 +189,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;
@@ -231,9 +239,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,9 +260,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 {
@@ -286,9 +298,11 @@ typedef struct POLICYQUALINFO_st {
     } d;
 } POLICYQUALINFO;
 
+/* clang-format off */
 {-
     generate_stack_macros("POLICYQUALINFO");
 -}
+/* clang-format on */
 
 
 typedef struct POLICYINFO_st {
@@ -296,9 +310,11 @@ typedef struct POLICYINFO_st {
     STACK_OF(POLICYQUALINFO) *qualifiers;
 } POLICYINFO;
 
+/* clang-format off */
 {-
     generate_stack_macros("POLICYINFO");
 -}
+/* clang-format on */
 
 typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
 
@@ -307,9 +323,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 +337,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;
@@ -402,7 +422,9 @@ struct ISSUING_DIST_POINT_st {
                         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 */
 
@@ -473,9 +495,11 @@ typedef struct x509_purpose_st {
     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
@@ -798,9 +822,11 @@ int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
                              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
@@ -819,9 +845,11 @@ typedef struct ASIdOrRange_st {
     } u;
 } ASIdOrRange;
 
+/* clang-format off */
 {-
     generate_stack_macros("ASIdOrRange");
 -}
+/* clang-format on */
 
 typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
 
@@ -860,9 +888,11 @@ typedef struct IPAddressOrRange_st {
     } u;
 } IPAddressOrRange;
 
+/* clang-format off */
 {-
     generate_stack_macros("IPAddressOrRange");
 -}
+/* clang-format on */
 
 typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
 
@@ -882,9 +912,11 @@ typedef struct IPAddressFamily_st {
     IPAddressChoice *ipAddressChoice;
 } IPAddressFamily;
 
+/* clang-format off */
 {-
     generate_stack_macros("IPAddressFamily");
 -}
+/* clang-format on */
 
 
 typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
@@ -959,9 +991,11 @@ int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain,
 
 #endif                         /* OPENSSL_NO_RFC3779 */
 
+/* clang-format off */
 {-
     generate_stack_macros("ASN1_STRING");
 -}
+/* clang-format on */
 
 /*
  * Admission Syntax
@@ -974,10 +1008,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(
@@ -1036,9 +1072,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 +1087,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;
 
@@ -1273,13 +1313,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 {
@@ -1315,9 +1359,11 @@ 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
@@ -1341,13 +1387,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;
diff --git a/providers/common/der/der_digests_gen.c.in b/providers/common/der/der_digests_gen.c.in
index 9b6da1dafb1..b08c6685f6b 100644
--- a/providers/common/der/der_digests_gen.c.in
+++ b/providers/common/der/der_digests_gen.c.in
@@ -12,9 +12,11 @@
 #include "prov/der_digests.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/NIST.asn1',
                                      'providers/common/der/DIGESTS.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_dsa_gen.c.in b/providers/common/der/der_dsa_gen.c.in
index dd581567e87..cd944b77714 100644
--- a/providers/common/der/der_dsa_gen.c.in
+++ b/providers/common/der/der_dsa_gen.c.in
@@ -18,8 +18,10 @@
 #include "prov/der_dsa.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/DSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_ec_gen.c.in b/providers/common/der/der_ec_gen.c.in
index ec47686ebe2..5270a1e15a5 100644
--- a/providers/common/der/der_ec_gen.c.in
+++ b/providers/common/der/der_ec_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_ec.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/EC.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_ecx_gen.c.in b/providers/common/der/der_ecx_gen.c.in
index bcd45b6e4d5..e0d83e225f6 100644
--- a/providers/common/der/der_ecx_gen.c.in
+++ b/providers/common/der/der_ecx_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_ecx.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/ECX.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_hkdf_gen.c.in b/providers/common/der/der_hkdf_gen.c.in
index 43abbd12918..99fb84b5376 100644
--- a/providers/common/der/der_hkdf_gen.c.in
+++ b/providers/common/der/der_hkdf_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_hkdf.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/HKDF.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_ml_dsa_gen.c.in b/providers/common/der/der_ml_dsa_gen.c.in
index 0097fc7a0c2..30f42f32cf8 100644
--- a/providers/common/der/der_ml_dsa_gen.c.in
+++ b/providers/common/der/der_ml_dsa_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_ml_dsa.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/ML_DSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_rsa_gen.c.in b/providers/common/der/der_rsa_gen.c.in
index 0560f649e8e..78526caba8e 100644
--- a/providers/common/der/der_rsa_gen.c.in
+++ b/providers/common/der/der_rsa_gen.c.in
@@ -12,9 +12,11 @@
 #include "prov/der_rsa.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/NIST.asn1',
                                      'providers/common/der/RSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_slh_dsa_gen.c.in b/providers/common/der/der_slh_dsa_gen.c.in
index c337c9e50dc..41f43cccc10 100644
--- a/providers/common/der/der_slh_dsa_gen.c.in
+++ b/providers/common/der/der_slh_dsa_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_slh_dsa.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/SLH_DSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_sm2_gen.c.in b/providers/common/der/der_sm2_gen.c.in
index ac28307bfb7..4c7be185d2e 100644
--- a/providers/common/der/der_sm2_gen.c.in
+++ b/providers/common/der/der_sm2_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_sm2.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/SM2.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/der/der_wrap_gen.c.in b/providers/common/der/der_wrap_gen.c.in
index d3a6bb90925..11864907b4f 100644
--- a/providers/common/der/der_wrap_gen.c.in
+++ b/providers/common/der/der_wrap_gen.c.in
@@ -12,8 +12,10 @@
 #include "prov/der_wrap.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/wrap.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_C });
 -}
+/* clang-format on */
diff --git a/providers/common/include/prov/der_digests.h.in b/providers/common/include/prov/der_digests.h.in
index f8f89973398..b1bfbddaa17 100644
--- a/providers/common/include/prov/der_digests.h.in
+++ b/providers/common/include/prov/der_digests.h.in
@@ -12,9 +12,11 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/NIST.asn1',
                                      'providers/common/der/DIGESTS.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
diff --git a/providers/common/include/prov/der_dsa.h.in b/providers/common/include/prov/der_dsa.h.in
index 75e44a16f17..62de371588f 100644
--- a/providers/common/include/prov/der_dsa.h.in
+++ b/providers/common/include/prov/der_dsa.h.in
@@ -12,11 +12,13 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/DSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 /* Subject Public Key Info */
 int ossl_DER_w_algorithmIdentifier_DSA(WPACKET *pkt, int tag, DSA *dsa);
diff --git a/providers/common/include/prov/der_ec.h.in b/providers/common/include/prov/der_ec.h.in
index ebc9bb0310e..a398ae672a5 100644
--- a/providers/common/include/prov/der_ec.h.in
+++ b/providers/common/include/prov/der_ec.h.in
@@ -13,11 +13,13 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/EC.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 /* Subject Public Key Info */
 int ossl_DER_w_algorithmIdentifier_EC(WPACKET *pkt, int cont, EC_KEY *ec);
diff --git a/providers/common/include/prov/der_ecx.h.in b/providers/common/include/prov/der_ecx.h.in
index 2ca86fb1dd7..2e22899a6b6 100644
--- a/providers/common/include/prov/der_ecx.h.in
+++ b/providers/common/include/prov/der_ecx.h.in
@@ -13,11 +13,13 @@
 #include "crypto/ecx.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/ECX.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 int ossl_DER_w_algorithmIdentifier_ED25519(WPACKET *pkt, int cont, ECX_KEY *ec);
 int ossl_DER_w_algorithmIdentifier_ED448(WPACKET *pkt, int cont, ECX_KEY *ec);
diff --git a/providers/common/include/prov/der_hkdf.h.in b/providers/common/include/prov/der_hkdf.h.in
index b0820ed10fc..4a166541e16 100644
--- a/providers/common/include/prov/der_hkdf.h.in
+++ b/providers/common/include/prov/der_hkdf.h.in
@@ -12,8 +12,10 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/HKDF.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
diff --git a/providers/common/include/prov/der_ml_dsa.h.in b/providers/common/include/prov/der_ml_dsa.h.in
index 07f0f3f4ac9..f78be87fa67 100644
--- a/providers/common/include/prov/der_ml_dsa.h.in
+++ b/providers/common/include/prov/der_ml_dsa.h.in
@@ -13,10 +13,12 @@
 #include "crypto/ml_dsa.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/ML_DSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 int ossl_DER_w_algorithmIdentifier_ML_DSA(WPACKET *pkt, int tag, ML_DSA_KEY *key);
diff --git a/providers/common/include/prov/der_rsa.h.in b/providers/common/include/prov/der_rsa.h.in
index 97e5377358c..028fef1cc84 100644
--- a/providers/common/include/prov/der_rsa.h.in
+++ b/providers/common/include/prov/der_rsa.h.in
@@ -13,12 +13,14 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/NIST.asn1',
                                      'providers/common/der/RSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 /* PSS parameters */
 int ossl_DER_w_RSASSA_PSS_params(WPACKET *pkt, int tag,
diff --git a/providers/common/include/prov/der_slh_dsa.h.in b/providers/common/include/prov/der_slh_dsa.h.in
index 017a3daa183..ae83c122d69 100644
--- a/providers/common/include/prov/der_slh_dsa.h.in
+++ b/providers/common/include/prov/der_slh_dsa.h.in
@@ -13,10 +13,12 @@
 #include "crypto/slh_dsa.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/SLH_DSA.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 int ossl_DER_w_algorithmIdentifier_SLH_DSA(WPACKET *pkt, int tag, SLH_DSA_KEY *key);
diff --git a/providers/common/include/prov/der_sm2.h.in b/providers/common/include/prov/der_sm2.h.in
index f4f2bd72ee9..fbd21c36c1b 100644
--- a/providers/common/include/prov/der_sm2.h.in
+++ b/providers/common/include/prov/der_sm2.h.in
@@ -13,11 +13,13 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/SM2.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */
 
 /* Subject Public Key Info */
 int ossl_DER_w_algorithmIdentifier_SM2(WPACKET *pkt, int cont, EC_KEY *ec);
diff --git a/providers/common/include/prov/der_wrap.h.in b/providers/common/include/prov/der_wrap.h.in
index a20f3d45ec8..7b314b6edad 100644
--- a/providers/common/include/prov/der_wrap.h.in
+++ b/providers/common/include/prov/der_wrap.h.in
@@ -12,8 +12,10 @@
 #include "internal/der.h"
 
 /* Well known OIDs precompiled */
+/* clang-format off */
 {-
     $OUT = oids_to_c::process_leaves('providers/common/der/wrap.asn1',
                                      { dir => $config{sourcedir},
                                        filter => \&oids_to_c::filter_to_H });
 -}
+/* clang-format on */